Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

git rm-conflicts unnecessary? #11

Closed
Feh opened this Issue · 1 comment

2 participants

@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
Owner

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.