During git cherry-pick, undo changes to a single file, reverting to my version

Asked Oct 04 '16 at 15:14

Active Oct 04 '16 at 15:14

Viewed 2,066 times

I'm doing a cherry-pick for a large commit with multiple files. There are some conflicts, but for some of the conflicting files I'm sure that I don't need any of the changes. I'd just like to revert all changes applied to these files in that commit - a bit like 'resolve using mine' in svn, or git checkout <filename> to undo changes applied to a file (which doesn't seem to work here).

Is there a command to do this, without manually having to go through the diffs in these files?

FFR, feel free to also include the operation to resolve using theirs.

asked Oct 04 '16 at 15:14

Vincent Sels

2,711
1
24
31

9

Try `git checkout -- ` to use ours, and `git checkout -- ` for theirs. – ElpieKay Oct 04 '16 at 15:37
3

@ElpieKay that works perfectly, thanks! Do you want to post this as an answer so I can approve it? – Vincent Sels Oct 05 '16 at 07:45
2

@ElpieKay thanks, you should post this as the answer! – Steven Shaw Jun 10 '19 at 23:02
@ElpieKay this is answer material! – volingas Oct 09 '19 at 10:34

During git cherry-pick, undo changes to a single file, reverting to my version

0 Answers0