1

While git merging I run into a conflict. First file I want resolve manually but for other files I want to use git merge my_branch -s ours. How can I do that?

tsh
  • 877
  • 8
  • 12
  • 1
    If you really want to ignore changes on the other side entirely, you can `git checkout HEAD ` for each such path. – torek Aug 09 '17 at 15:41
  • 1
    If it's not required to do this via command line, some Git GUI apps (ex. SourceTree) already have this feature. You can view all the conflicted files, resolve some manually, then select all the rest and resolve them automatically by using "ours" or "theirs". – Gino Mempin Aug 10 '17 at 08:21
  • 1
    @Gino Mempin ty, didnt know that. Anyway, I want to do this in plain old git. :) – tsh Aug 10 '17 at 09:16

0 Answers0