.gitattribute changes
common file
task1 changes
task2 changes
task3 changes
task2 merging
global file changes
merging task3