Re: git commits&branches mess up
Thank you, I was trying to solve with [1] but your
$ git checkout master -- darktable.spec # solve the conflict by
taking the file as it is in master
is the key of success :-)
[1]:
https://help.github.com/articles/resolving-a-merge-conflict-from-the-comm...