Add content in another respository and commit to server
Change file 3 to add some rebase
Modify first time in branch2
Modify second time in branch2
Third time merge
modfiy 4th in branch2
Add 4.txt file on branch master
Change 4.txt file on branch master
First time modify file 4.txt
Second time modify
Change file on master to commit in repo folder
resolve conflict on repo folder