Git: Ahead and Behind together. How to solve?

git project-management
gaussblurinc picture gaussblurinc · Mar 28, 2013 · Viewed 29.4k times · Source

I have a commit with 1 ahead and 6 behind.

What should I do in this situation?

I think, that solution might be like this: git push and after git pull

But I think, it can solve only Behind.
Maybe I am wrong. 

-------*------*-----*-----*-----B
        \
         \
          \
           *-------A

I make my part and change sdk.
Now I want to merge with B.

Answer

Nevik Rehnel picture Nevik Rehnel · Mar 28, 2013

git pull (or rather, the git merge part that pull does) will "solve" both 'ahead' and 'behind'.

branch is X commits behind means that there are X new (unmerged) commits on the branch which is being tracked by your current branch.

branch is X commits ahead analogously means that your branch has X new commits, which haven't been merged into the tracked branch yet.

Once you've pulled (thereby merging the remote changes into your local ones) and pushed (thereby publishing your changes and the merge to the remote), your own branch and the remote branch will point to the same commit, so neither is ahead or behind.

Related questions

Project management with Git integration

I've looked around for a project management system, I've tried to use this one but it lacks some features I want and doesn't really seem to be under any sort of active development. I only need a few features: Basic …

Read More
How to manage multiple versions of a project?

I have a project that is open sourced using git for revision control. Soon, I am going to release a premium hosted version of the project as well, but there will be changes made to the code specifically for the …

Read More
Project management to go with GitHub

(EDIT: This question is now outdated for my particular issue, as Google Code supports git now and I've converted Protocol Buffers to Mercurial anyway. However, it's still of general interest, IMO.) My C# Protocol Buffers Port uses github for its …

Read More