[git-users] Branch ahead by x commits

2014-09-21 Thread Kunal Bajpai
I have been using Git for about 2-3 months and have been using it on command line for about a week. I wanted a little help with best practices using Git branching. I had created a branch out *master *committed some code to the branch pushed it to the *remote *with same name. But now how do I

Re: [git-users] Branch ahead by x commits

2014-09-21 Thread Gergely Polonkai
Hello, this depends on many things, like you agreed workflow (even if you work alone, you should agree with yourself). There are [1] and [2] as notable examples. Basically, I would say yes, you should switch to master (git checkout master) and merge your changes (git merge your-other-branch).