Drag the edges to resize the window.

In Projects, you can keep track of your progress as you go throught the tasks. Check each item as you complete it!

Code Editor
Git Branching

merge conflict II

Let's say you decide you'd like to merge the changes from fencing into master.

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 fencing into master, Git will not know which version of the file to keep.

Report a Bug
If you see a bug or any other issue with this page, please report it here.