Should I merge master into a feature branch to bring it up to date? Would this be considered bad practice?

Question

I have a situation like this:

            (master)
A - B - E - F
      \\       
        C - D
            (feature-x)

Should I merge master i

Answer 1

The most common workflow for handling this situation would probably be to rebase your feature branch on the master branch:

$ git checkout feature-x
$ git rebase master

This gives you:

            (master)
A - B - E - F
             \       
               C - D
                   (feature-x)