How does one work on a new git branch that depends on another git branch that is not yet merged?

Here’s my scenario:

Short of badgering my project lead to accept and merge my first branch faster, what is the best process to follow here?

I am wondering if I need to start a new, third branch based on problem_fixes (instead of master) and merge in my commits to my_feature? Or will it be okay if I simply merge problem_fixes into my_feature and continue work — assuming problem_fixes is merged into master first, when my_feature is merged it should theoretically be okay(?)

  • git ,,local push'' from feature branch to master, without checkout
  • What is the simplest way to do branching and merging using TortoiseSVN?
  • What are the differences between GIT and SVN when it comes to merge conflicts solving
  • Switch remote branch in Git
  • Branching: different config files for release/development
  • How do I publish to <me>.github.com?
  • 2 Solutions collect form web for “How does one work on a new git branch that depends on another git branch that is not yet merged?”

    Yes, I think you’re on the right track. What I would do is create a new my_feature branch, perhaps work a little bit. When I realise that my_feature depends on problem_fixes, merge that branch in. This could happen right away if you know that you’ll need it. Then, when my_feature is merged into master, you’ll already have the changes you need.

    Note that as long as you have a robust code review procedure, then if you try to merge my_feature into master before problem_fixes, then you will notice at that time.

    Create your topic branch off of the first branch. As soon as the first is merged into master you can rebase on top of that, and assuming not too much was changed it shouldn’t be a problem.

    If the commits of the first branch aren’t changed your new branch will stack neatly on top of that, and if the commits are changed (squashed, edited or whatever) you can always do an interactive rebase of the second branch and edit it to look good once the first branch has been merged.

    Git Baby is a git and github fan, let's start git clone.