I’m working on a fork of a project and I send a pull request. But the repo I forked from gets updated when I still have a pending push. How do I keep upto date without losing my changes from the pull request?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I’m working on a fork of a project and I send a pull request. But the repo I forked from gets updated when I still have a pending push. How do I keep upto date without losing my changes from the pull request?
The commits from your pull request should be in a different branch.
So you can simply
git pull upstreamandgit merge --ff-only upstream/master(ensure that you are in your master branch first:git checkout master) to bring your master branch up to date (assuming the original repo is in a remote calledupstream)