my-git-project ##main Commiting Commit branch1 - conflict Commit branch2 - much conflict? Change from master Change 4 Commit change 5 on branch1