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

What you are seeing means that automatic merge could not resolve the conflicts in the files. You need to resolve these conflicts manually. Run git mergetool or git gui.