From a4e28874efc1fe607fe6287677225c1eb8b899b6 Mon Sep 17 00:00:00 2001 From: luanableal Date: Mon, 25 Apr 2022 16:00:05 -0300 Subject: [PATCH] =?UTF-8?q?For=C3=A7ando=20o=20conflito?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..4e078fa --- /dev/null +++ b/index.html @@ -0,0 +1,20 @@ + + + + + + Caos + + +

Página de teste para resolver conflitos

+

+ Nessa página vamos testar como resolver conflitos usando git rebase. + Os alunos farão commits na mesma tag . +

+ +

Aqui que vão rolar os conflitos

+

+ Forçando o conflito. +

+ + \ No newline at end of file