This wiki has undergone a migration to Confluence found Here
Difference between revisions of "GIT conflict resolution documentation"
Jump to navigation
Jump to search
(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...") |
|||
| Line 1: | Line 1: | ||
| − | == set up == | + | Content on this page has been migrated to https://confluence.hl7.org/display/FHIR/GIT+Conflict+Resolution+Documentation |
| + | |||
| + | ==set up== | ||
git fetch origin | git fetch origin | ||
| Line 15: | Line 17: | ||
> both modified: ... | > both modified: ... | ||
| − | == fix == | + | ==fix== |
fix the file, or grab that least from master | fix the file, or grab that least from master | ||
| − | === grabbing the file from master === | + | ===grabbing the file from master=== |
git checkout --theirs [path] | git checkout --theirs [path] | ||
| − | == committing == | + | ==committing== |
git add [path] | git add [path] | ||
git commit -m "Fix [path] conflict" | git commit -m "Fix [path] conflict" | ||
git push | git push | ||
Latest revision as of 15:49, 1 May 2020
Content on this page has been migrated to https://confluence.hl7.org/display/FHIR/GIT+Conflict+Resolution+Documentation
set up
git fetch origin git checkout [branch] git merge origin/master git status
> You have unmerged paths. > (fix conflicts and run "git commit") > (use "git merge --abort" to abort the merge) > > Unmerged paths: > (use "git add <file>..." to mark resolution) > > both modified: ...
fix
fix the file, or grab that least from master
grabbing the file from master
git checkout --theirs [path]
committing
git add [path] git commit -m "Fix [path] conflict" git push
