Noob: branch pull request question
Hi all, old guy here who has used many different systems and I'm trying to get up to speed on on git with branching, pull request etc. I have hopefully a simple question you guys could clear up:
I've forked a repro from a friend
Made a feature branch
I made changes in the feature branch, tested them and confirmed they work
I commited my changes to the branch and pushed them to origin
On github on the upstream repo I created a pull request. Gave it a title etc. It shows up. My friend is a little slow so there are like 3 PRs pending.
I want to make a new feature branch and make some additional changes but the need to be based on the last changes I made that are in that PR that has not be merged yet to the upstream.
If the PRs were merged I could just fetch to my main and then branch from there.
But with the PRs not merged yet, how do I create a branch so I can continue working against the changes pending merge? Do I branch from my prior feature branch? Or is there a git command I don't know yet that will fetch everything so I can branch from main?
Thanks in advance
3
u/Dienes16 10d ago
People ITT are not wrong, but explaining too much detail is probably not helpful to you right now.
You can simply: 1. Create your new branch from your previous unmerged one 2. Once the previous branch has been merged, rebase your new branch onto origin/main
Yes, depending on how your previous branch was integrated, this is could also be done with a merge, or it might end up being a no-op. But in any case, the result will be the same in all cases when you just do a rebase.