How to update a branched out develop branch with updates from the original develop branch?

user_18185871 0
Viewed 32

Illustrated with the git flow diagram below:

  1. I have an original develop branch (develop) that branched out to another develop branch (develop-2) that will be pulled into develop in the very far future.
  2. I am allowed to perform pull requests on these develop branches (develop and develop-2), but not allowed to edit them directly.
  3. I need an update that has occurred in develop after the branching out of develop-2 to add a new feature to develop-2.

How can I do this?

enter image description here

github git
1 Answers

if I do that, my final PR develop-2 > develop

It should not, provided the PR is done after develop2 is rebased on top of the target branch (develop)

That rebase will get rid of any duplicate commit (like one introduced by a cherry-pick or a previous PR).
Then a PR from develop2 to develop can take place.

VonC_63090
Related