GIT conflict resolution documentation
Revision as of 00:05, 17 June 2019 by GrahameGrieve
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
Copyright © Health Level Seven International ® ALL RIGHTS RESERVED. The reproduction of this material in any form is strictly forbidden without the written permission of the publisher.