ddollar/git-utils — Issue #11: git rm-conflicts unnecessary?
Author: Feh
Created: 2011-11-14 18:50:24+00:00
State: open

Hi,

just wanted to point out that AFAIK git-checkout already provides an command line option that does equivalent to what git-rm-conflict does: simply use "git checkout --ours -- path(s)" or --theirs, respectively.

Cheers