Hi all-
Helping a coworker resolve merge conflicts today I found I wanted a -Xtheirs
that completely replaces conflicted binary files with the copy from the
incoming branch. In other words rather than doing
$ git merge maint
... conflicts occur ...
$ git checkout --theirs --
Stephen Bash b...@genarts.com writes:
From reading the docs it's obvious the current -Xours and -Xtheirs
expect to work on hunks, so I (mostly) understand the current
behavior, but as a user it feels like I'm telling you how to
resolve conflicts, please do the same thing for binary files.
2 matches
Mail list logo
