How do I update my local repo without losing my already committed changes?
git, github
Solution
Use `git pull --rebase` it will apply your commit over the new commit.
Problem
So I forked and cloned and created a new branch, made few changes and made a git commit. However the original repo (upstream) had some new changes. I want to get them to my local repo and to be exact to the actual branch without losing my already committed changes. I do have one commit right now. I looked for about an hour on how to do that, but it seems like a dead end without knowing the actual keywords that would get me a result.