[pt-BR] Add file novice/git/03-conflict.md based on 9d183c9
[pt-BR] Finish translation of novice/git/03-conflict.md based on 9d183c9
[pt-BR] Add file novice/git/04-open.md based on a6fd62d
[pt-BR] Finish translation of novice/git/04-open.md based on a6fd62d