On 11/30/12 7:57 AM, Olle E. Johansson
wrote:
29 nov 2012 kl. 22:54 skrev Ovidiu Sas <osas@voipembedded.com>:
Please do a pull/fetch before any push to avoid this merge logs:
http://sip-router.org/wiki/git/commit-into-master
I try to, but somehow your commit made it in the middle... Sorry for that.
Still learning and adopting to git. :-)
It does not matter the order of the commits, before you push to
remote repository you will have to pull and rebase if someone pushed
other commits meanwhile. I other words, before pushing to
sip-router.org git master branch, is good to run [always]:
git pull --ff --rebase origin
Then no more merge notifications and logs.
Cheers,
Daniel
--
Daniel-Constantin Mierla - http://www.asipto.com
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda