Mahmoud K.
2020-11-28 08:38:50
This might look intimidating but bare with me:
- Get the hash of the stable common commit between you and master:
git log - Soft reset your commits to convert them to unstaged changes.
:
git reset --soft [hash] - Stash you current working changes:
git stash - Fetch latest changes from remote:
git fetch - Pull latest changes from remote:
git pull - Bring back your work from the stash:
git stash applyorgit stash pop - Resolve any conflicts and recommit your work:
git commit ... - Push your changes to remote:
git push
From now own, you should remember to do all your work on a separate branch and then merge them onto master.
热门github
6