Let's say you decide you'd like to merge the changes from
Here's where the trouble begins!
You've made commits on separate branches that alter the same line in conflicting ways. Now, when you try to merge
master, Git will not know which version of the file to keep.