What is the correct way to merge upstream without losing changes?

Question

I\'m in a bit of a pickle.

I started development on a fork of a repo a few months ago. I made some changes. I was about to push my code back to the master as a pull re

Answer 1

git pull --rebase works for me and keeps the history clean.