From 8784ebd2baf684964ca4cd08b8cad205f5b9fe97 Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 12:34:49 -0200 Subject: [PATCH 1/8] novos arquivos atualizados --- README.md | 6 ++++++ oficina.html | 0 teste.md | 1 + 3 files changed, 7 insertions(+) create mode 100644 oficina.html create mode 100644 teste.md diff --git a/README.md b/README.md index 11867eb..2607b4d 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,9 @@ Repositório de testes para a oficina de Git Pages: [https://marialabhackerspace.github.io/oficina-git/](https://marialabhackerspace.github.io/oficina-git/) + +## flaviamorim + +esse meu primeiro commit :) \o/ + +oficina de git \ No newline at end of file diff --git a/oficina.html b/oficina.html new file mode 100644 index 0000000..e69de29 diff --git a/teste.md b/teste.md new file mode 100644 index 0000000..6e9bcd8 --- /dev/null +++ b/teste.md @@ -0,0 +1 @@ +esse é um arquivo de teste oooooo \ No newline at end of file From f9f3a036714fc05c139d4491cd8243d90813af9c Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 12:41:19 -0200 Subject: [PATCH 2/8] alteracao no arquivo html concluida --- oficina.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/oficina.html b/oficina.html index e69de29..c347e1c 100644 --- a/oficina.html +++ b/oficina.html @@ -0,0 +1,10 @@ + + + + + Document + + + Ratatatataaatatata + + \ No newline at end of file From e2d4456292db08424bec2f74528728b0f4aa2270 Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 14:05:16 -0200 Subject: [PATCH 3/8] alteracoes para arquivo branch --- oficina.html | 1 + teste.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/oficina.html b/oficina.html index c347e1c..2b054ea 100644 --- a/oficina.html +++ b/oficina.html @@ -6,5 +6,6 @@ Ratatatataaatatata + tumtumtum \ No newline at end of file diff --git a/teste.md b/teste.md index 6e9bcd8..78a2ef2 100644 --- a/teste.md +++ b/teste.md @@ -1 +1,3 @@ -esse é um arquivo de teste oooooo \ No newline at end of file +esse é um arquivo de teste oooooo +vamos agora pra historia da branch +123 \ No newline at end of file From d35953cf9e41890b41ad35b7886e341e2de9a5a4 Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 14:13:02 -0200 Subject: [PATCH 4/8] realizei alteracoes --- oficina.html | 1 + teste.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/oficina.html b/oficina.html index c347e1c..45bbc49 100644 --- a/oficina.html +++ b/oficina.html @@ -6,5 +6,6 @@ Ratatatataaatatata + 123435 \ No newline at end of file diff --git a/teste.md b/teste.md index 6e9bcd8..c79c4cb 100644 --- a/teste.md +++ b/teste.md @@ -1 +1,3 @@ -esse é um arquivo de teste oooooo \ No newline at end of file +esse é um arquivo de teste oooooo +agora vamos trabalhar a branch +123 \ No newline at end of file From c01cffeaf41fc88ec309a1a5e2e45853271b624d Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 14:30:25 -0200 Subject: [PATCH 5/8] alteracao pra ver se aparece o negocinho --- oficina.html | 1 + 1 file changed, 1 insertion(+) diff --git a/oficina.html b/oficina.html index 2b054ea..72006e7 100644 --- a/oficina.html +++ b/oficina.html @@ -7,5 +7,6 @@ Ratatatataaatatata tumtumtum + ratatatatata \ No newline at end of file From 59e174bf8d9951ab6f0bf59bac40a27b6aacd879 Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 15:04:12 -0200 Subject: [PATCH 6/8] pra testar merge --- novoteste.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 novoteste.md diff --git a/novoteste.md b/novoteste.md new file mode 100644 index 0000000..8bf58da --- /dev/null +++ b/novoteste.md @@ -0,0 +1,2 @@ +estou aprendendo sobre git +flaviamorin \ No newline at end of file From 669125bdde836e2dcf47a22d84164e4c770f8b90 Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 15:18:35 -0200 Subject: [PATCH 7/8] mensagem para conflito\merge --- teste.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/teste.md b/teste.md index 246d8e1..e887627 100644 --- a/teste.md +++ b/teste.md @@ -4,4 +4,5 @@ agora vamos trabalhar a branch ======= vamos agora pra historia da branch >>>>>>> novalteracao -123 \ No newline at end of file +123 +testando merge e resolvendo conflitos From f2c4232075fb539dcb72c5b46f5d35cf67890f94 Mon Sep 17 00:00:00 2001 From: Flavia Date: Sat, 29 Oct 2016 15:22:54 -0200 Subject: [PATCH 8/8] testando conflito no merge --- README.md | 4 +++- oficina.html | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2607b4d..4ff5133 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,6 @@ Pages: [https://marialabhackerspace.github.io/oficina-git/](https://marialabhack esse meu primeiro commit :) \o/ -oficina de git \ No newline at end of file +oficina de git + +testando o merge diff --git a/oficina.html b/oficina.html index 45bbc49..9893779 100644 --- a/oficina.html +++ b/oficina.html @@ -7,5 +7,7 @@ Ratatatataaatatata 123435 +
+ merge merge merge \ No newline at end of file