file1
alter file1 in local
commit antes teste merge
Merge branch 'master' into local

 merge de master no branch local