You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
The text was updated successfully, but these errors were encountered:
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 :)
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
The text was updated successfully, but these errors were encountered: