-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
conflict resolver, pick all from branch/stash #2026
Comments
Good idea. I suppose if it's going to apply to the whole file, then the keybinding should be on the file itself rather than being in the merge panel (it can be both of course). Do we know if git already provides some CLI functionality to do this? I'm thinking something like |
I think the command is:
but I'm not sure how it can be done with a file that is inside a stash |
Yes, a keybinding on the file would be great. |
Could we possibly use |
i use this a lot for lock files, |
Having a menu which includes
I think we should go with the second option. I'll chuck a good-first-issue label on this cos it should be easy to implement. Any chance you're up to the task @linde12 (or @pr-313 / @nagylzs )? |
@jesseduffield |
I'd like to give it a shot! |
any progress here? I have a lock file with hundreds of changes to merge between. is the only option currently to use a cli command? Thanks! |
…l there Also add options for `git checkout --theirs` and `git checkout --ours` Fixes jesseduffield#2026
…l there Also add options for `git checkout --theirs` and `git checkout --ours` Fixes jesseduffield#2026
…l there Also add options for `git checkout --theirs` and `git checkout --ours` Fixes jesseduffield#2026
Is your feature request related to a problem? Please describe.
Sometimes when I merge two branches (or a branch and a stash), there are a few files that have lots of conflicts. A good example would be a package-lock.json file. If the two branches are diverged a long time ago, then there can be hundreds of conflicts within that file. Currently, the only available commands are "b: pick all hunks" and "space: pick hunk". I have tried to use "b" to "pick all hunks that are from branch X" or "pick all hunks that are from stash Y" but it does not work that way. I have to go over all hunks and manually pick each of them with "b".
Describe the solution you'd like
When the conflict is a result of merging or rebasing branch X with branch Y, or branch X with stash Y, then there should be an option to accept the complete file version from either X or Y, without going through the hunks.
The text was updated successfully, but these errors were encountered: