This wiki has undergone a migration to Confluence found Here

Revision history of "GIT conflict resolution documentation"

Jump to navigation Jump to search

Diff selection: Mark the radio boxes of the revisions to compare and hit enter or the button at the bottom.
Legend: (cur) = difference with latest revision, (prev) = difference with preceding revision, m = minor edit.

  • curprev 04:05, 17 June 2019GrahameGrieve talk contribs 538 bytes +538 Created page with "== set up == git fetch origin git checkout [branch] git merge origin/master git status > You have unmerged paths. > (fix conflicts and run "git commit") > (u..."