Geek Answers Handbook

Github: get a new development branch in your fork

I thought I had git quite waxed, but I was a bit confused about this problem.

Here is the image: I forked the “work off” branch from the project to my own github repository, cloned it to a local one, created the git -flow function, made the material and published. All perfectly.

At the same time, the original project changed to a new development branch (call it “develop2”), so my published function could not be involved in the main project.

So - on the advice - I created a local branch “develop2”, deleted my local branch “develop”, pulled out “develop2” from the main repo of the project, and then combined it with my local function. Everything is fine, EXCEPT ... my personal github repo still has an old "development" branch and a function based on this branch.

So my question is: what should I do now? A few options that I have considered:

  • Remove your entire “developed” fork on github, fork “develop2” from the main project, then pull this to your local repo and merge, and then publish my function and issue a transfer request. (Uncertainty: I need to clone, not pull, a new fork so that it has the correct origin.)
  • Remove the branch "develop" by origin and function, click the new branch develop2, etc.
  • Force the "develop2" branch to the beginning, then rename it and do the same with the function.

If something goes wrong, although I could be stuck with the fact that I would have to redo many things that would be tedious, to say the least. any advice from the guru?

+5
source share
1 answer

You absolutely do not need to redo things - Git is well equipped to solve this problem.

-, forks GitHub - , "" " - develop2 . upstream, , .

, , upstream, a git fetch upstream/develop2 . ( , git reset --hard develop~), develop2 , develop2 upstream/develop2: git rebase --onto upstream/develop2 upstream/develop develop.

:

              X---Y---Z upstream/develop2
             /
            |           H---I---J  develop, develop2
            |          /
            | E---F---G  upstream/develop
            |/
A---B---C---D

:

                        H'--I'--J' develop2
                       /
              X---Y---Z upstream/develop2
             /
            |           H---I---J  develop
            |          /
            | E---F---G  upstream/develop
            |/
A---B---C---D
+3

More articles:


All Articles