My dev branch is 1 commit per master after pull request

Question

I have two branches: master and 0.6

I changed the code to 0.6. I created a Pull request for two commits that I made on the Github website. Then I combined this PR with 0.6 for mastering. Both branches contain changes.

But why is my 0.6 branch now one commit per host?

Answer 1

You need to create a merge between your master and branch 0.6 and branch 0.6 for the master, since 0.6 is 1 commit and 11 is ahead of the master. You can see the diff changes here in comparison: https://github.com/stwe/DatatablesBundle/compare/0.6...master

Since your repo is open, I created them for you: https://github.com/stwe/DatatablesBundle/pull/70 and https://github.com/stwe/DatatablesBundle/pull/71