Code review comment for lp:~elementary-dev-community/switchboard-plug-pantheon-shell/bug-1182413

Cameron Norman (cameronnemo) wrote :

I have worked on this and rebased it. Merge request here.

This is how the conflicts text is formatted:

    conflict-free code
<<<<<<< TREE
    pre-merge code
=======
    code from where you were trying to merge from
>>>>>>> MERGE-SOURCE
    conflict-free code

Once you merge the code from all of those types of sections in a file, you just use `bzr resolve FileName.vala`.

« Back to merge proposal