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

After you've resolved a merge, you need to use git add to add the files you've changed to the index, and then commit (like the message says). This says to git "Yes, I really do want to make these changes".

Remember, always use git add before committing (either normally or committing a merge), if you're using the command line interface. Frontends like magit can streamline this for you so you don't have to worry about typing "git add" every time.