This wiki has undergone a migration to Confluence found Here

GIT conflict resolution documentation

From HL7Wiki
Jump to navigation Jump to search

Content on this page has been migrated to

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 the file, or grab that least from master

grabbing the file from master

 git checkout --theirs [path]


 git add [path]
 git commit -m "Fix [path] conflict"
 git push