Skip to content

Merge Conflicts

Jump to bottom Edit New page
jperl edited this page Jun 1, 2012 · 4 revisions

When merging:

  • Local is the branch you are on
  • Remote is the branch you are merging into the branch you are on
Add a custom footer
Add a custom sidebar
Clone this wiki locally