Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

git rm-conflicts unnecessary? #11

Closed
Feh opened this Issue Nov 14, 2011 · 1 comment

Comments

Projects
None yet
2 participants

Feh commented Nov 14, 2011

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

Owner

ddollar commented Nov 7, 2014

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 :)

@ddollar ddollar closed this Nov 7, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment