0

enter image description here

There are tons of folder-conflicts on my current work. I can merge one by one by clicking "Take Theirs" or "Take Ours". But it's too tiresome and wasting of time.

Do you have any good method? [Using Git bash or Git GUI is OK.]

Community
  • 1
  • 1
Zhang
  • 3,030
  • 2
  • 14
  • 31
  • https://stackoverflow.com/a/36820559/10921202 Does this solution fine to you? – dunajski Jan 25 '19 at 06:12
  • @dunajski, you means "git checkout --ours Readme.md", I checkout those folders one by one with "--ours"? – Zhang Jan 25 '19 at 06:29
  • @dunajski, PS, I got those conflicts not by checkout, but "git stash pop" – Zhang Jan 25 '19 at 06:31
  • --ours , refers to files on branch that you checkout. But do you need those changes in stash? If not stash them again by `git stash` and then merge. If you need them you have to commit this changes before. Use `git stash --list` to check what's in your stash. – dunajski Jan 25 '19 at 06:31
  • 1
    If you commited all your changes before using `git stash pop` you can type `git reset --hard` and this will back your work to this latest commit. – dunajski Jan 25 '19 at 06:38
  • Perhaps show a part of `git status`. I think this is really clear about what you really have. – Christoph Jan 25 '19 at 09:16

0 Answers0