Menu
I have two branches: master and 0.6
I have changed some code in 0.6. I have created a Pull Request for the two commits I made on the Github website. I then merged this PR from 0.6 to master. Both branches contains the changes.
But why is my branch 0.6 now one commit behind master?
359
The 4 commits behind master just means that your branch is out of sync with the master, and you should do a merge from master to your branch in order to get the latest changes from master into your branch.
The updates were rejected because the tip of your current branch is behind error can be fixed by pushing to a remote branch. This process is called a Git push, and it debugs the errors of the current branch, which is also known as a local branch.
You need to create a merge between your master and 0.6 branch and the 0.6 branch to master, since 0.6 is 1 commit behind and 11 commits ahead of master. You can review the changes diff here in the compare: https://github.com/stwe/DatatablesBundle/compare/0.6...master
Since your repo is public, I created them for you: https://github.com/stwe/DatatablesBundle/pull/70 and https://github.com/stwe/DatatablesBundle/pull/71
103
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
