Trouble merging upstream changes back into my branch

Question

I\'m running into conflicts while trying to merge upstream changes back into my branch and I\'m not sure how to resolve them.

I created my own fork. I cloned it. I m

Answer 1

Run git commit (after adding the files) the second time, not git merge.

Also the conflict resolution will create files to help you merge. See also git mergetool.