Confused about git rebase
My workflow:
$ git remote -v
origin git@github.abc.abc.com:abc/dev.git (fetch)
origin git@github.abc.abc.com:abc/dev.git (push)
upstream git@github.abc.abc.com:companyname/dev.git (fetch)
upstream git@github.abc.abc.com:companyname/dev.git (push)
Fork git @ github.abc.abc.com: companyname / dev.git using the github web interface. Create git @ github.abc.abc.com: abc / dev.git
Now:
1. git clone git@github.abc.abc.com:abc/dev.git
2. git remote add origin git@github.abc.abc.com:abc/dev.git
3. git remote add upstream git@github.abc.abc.com:companyname/dev.git
4. git checkout -b upstream-master upstream/master
5. git checkout -b master origin/master
Now change your code and create a commit on your local master branch.
5.1. git add somecode.c
5.2. git commit -m "my commit for which I will make a PR"
6. git push origin master
Now go to git@github.abc.abc.com:abc/dev.git
on the github web interface and create a PR for the upstream / presenter:
After merging the PR, do the following:
7. git checkout upstream-master
8. git pull --rebase
Now my local upstream-master
has PR merge commit but master
(which is the source / master) doesn't work.
Q: Which branch should I reinstall, for what and why?
After steps 7 and 8, I have to do
git rebase origin-master
or should i do
git checkout origin-master
git rebase upstream-master
source to share
If you want to get something in your local master that has been merged on the remote upstream / master branch, you must:
git checkout master
to put yourself in the local branch you want to update
and then
git rebase upstream/master
To get changes from the upstream / master deletion branch to your current, local branch
source to share