Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minhas alteracoes todas lindas #5

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

minhas alteracoes todas lindas #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8784ebd
novos arquivos atualizados
flaviamorim Oct 29, 2016
f9f3a03
alteracao no arquivo html concluida
flaviamorim Oct 29, 2016
e2d4456
alteracoes para arquivo branch
flaviamorim Oct 29, 2016
d35953c
realizei alteracoes
flaviamorim Oct 29, 2016
c01cffe
alteracao pra ver se aparece o negocinho
flaviamorim Oct 29, 2016
937384f
erro em mesclar
flaviamorim Oct 29, 2016
59e174b
pra testar merge
flaviamorim Oct 29, 2016
669125b
mensagem para conflito\merge
flaviamorim Oct 29, 2016
f2c4232
testando conflito no merge
flaviamorim Oct 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@
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

testando o merge
2 changes: 2 additions & 0 deletions novoteste.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
estou aprendendo sobre git
flaviamorin
13 changes: 13 additions & 0 deletions oficina.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Document</title>
</head>
<body>
Ratatatataaatatata
123435
<br>
merge merge merge
</body>
</html>
8 changes: 8 additions & 0 deletions teste.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
esse é um arquivo de teste oooooo
<<<<<<< HEAD
agora vamos trabalhar a branch
=======
vamos agora pra historia da branch
>>>>>>> novalteracao
123
testando merge e resolvendo conflitos