ignore
Merge remote-tracking branch 'origin/branch-A'
Merge pull request #1 from iavor78/branch-A

Branch a - ok
file 2 master
ignore
file 2 master
Merge branch 'master' of https://github.com/iavor78/GitTest_1
file 2

file 2