git rm-conflicts unnecessary?

[Feh]

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

[ddollar]

Hello. I apologize for the delayed response. I am currently declaring issue bankruptcy. If this issue still applies to you please feel free to re-open and explain. Thanks :)