![]() ![]() Hence, I'm not really sure what your question was. Running git mergetool does that for you-extracts the base, left-side/local/ ours, and right-side/remote/ theirs versions-just before running your configured merge tool. If stashed changes are applied ontop of new commits or other in-progress changes, there’s a chance for merge conflicts to arise. Only two of them, -ours (usually the same as the HEAD commit version) and -theirs (the stashed-commit version, in this case), have convenient git checkout command syntax, but you can extract the merge base version too, using the ::path syntax. Play video What are Git stash merge conflicts Git stash allows you to save a draft of your in-progress changes and revert your working directory back to a clean slate. Īll three versions of the file are present in the index at this point. So, i am wondering if there is a way to enforce git stash to not auto-merge but to leave the conflicts in place. ![]() Hit return to start merge resolution tool (bc): ![]() [snip configuration complaint - I never use git mergetool $ git stash WIP on master: 6fee57d add file "file" HEAD is now at f9a96c0 conflicting changes for stash | * c466c42 index on master: 6fee57d add file "file"Īt this point, regardless of whether I run git stash apply or git stash pop, I get a merge conflict and then the process stops (does not do the second half of git stash pop): $ git stash applyĬONFLICT (content): Merge conflict in file | * 069a595 (refs/stash) WIP on master: 6fee57d add file "file" * f9a96c0 (HEAD -> master) conflicting changes for stash The merge process used by git stash apply-this is the first half of git stash pop-is the same as any other merge, in terms of effect left behind: $ git status ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |