Skip to content

Alteração da PatyMori #12

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

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

Alteração da PatyMori #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6c7b378
Criado .gitignore e teste.md
patymori Oct 29, 2016
5fb9f21
Alterado teste.md
patymori Oct 29, 2016
c8668fd
Alterado teste.md
patymori Oct 29, 2016
4189d83
Conflito merge teste.md
patymori Oct 29, 2016
23b583b
Outra alteração no teste
patymori Oct 29, 2016
c689e0f
Alteração para teste do merge
patymori Oct 29, 2016
e149ab4
Conflitos com a branch teste
patymori Oct 29, 2016
c0a3724
Alterado teste.md
patymori Oct 29, 2016
2b2d6ce
Alteração para merge do teste
patymori Oct 29, 2016
d72fb50
Atualizando com a master
patymori Oct 29, 2016
c20a420
Teste de pull request
patymori 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.swp

7 changes: 7 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,10 @@
Repositório de testes para a oficina de Git

Pages: [https://marialabhackerspace.github.io/oficina-git/](https://marialabhackerspace.github.io/oficina-git/)

## Patymori

Este é o meu primeiro commit neste projeto! =D

Oficina Git do MariaLab! <3

2 changes: 2 additions & 0 deletions patymori.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Teste para o pull request!

15 changes: 15 additions & 0 deletions teste.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Teste

Este é um arquivo de teste! xP

Alterando na outra branch...

## Título super legal para o merge

Alterando n GH-Pages

Teste de merge com a master agora

Agora vamos ver esse merge!

Outra alteração nesse cara