30 nov 2012 kl. 08:59 skrev Daniel-Constantin Mierla <[email protected]>:
> > On 11/30/12 7:57 AM, Olle E. Johansson wrote: >> 29 nov 2012 kl. 22:54 skrev Ovidiu Sas <[email protected]>: >> >>> 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 I did the git pull immediately before the push, but I did not have the arguments. Thanks for the lesson! > Then no more merge notifications and logs. Nice. /O :-) > > Cheers, > Daniel > > -- > Daniel-Constantin Mierla - http://www.asipto.com > http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
_______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
