Module: sip-router Branch: master Commit: cf97967489f1b61c5bf0a841f9f650e40fc9911e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf979674...
Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: Thu Nov 29 22:01:05 2012 +0100
Merge branch 'master' of ssh://git.sip-router.org/sip-router
* 'master' of ssh://git.sip-router.org/sip-router: kamctlrc: adding sca to the list of extra modules
---
Please do a pull/fetch before any push to avoid this merge logs: http://sip-router.org/wiki/git/commit-into-master
Thanks, Ovidiu
On Thu, Nov 29, 2012 at 4:01 PM, Olle E. Johansson oej@edvina.net wrote:
Module: sip-router Branch: master Commit: cf97967489f1b61c5bf0a841f9f650e40fc9911e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf979674...
Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: Thu Nov 29 22:01:05 2012 +0100
Merge branch 'master' of ssh://git.sip-router.org/sip-router
- 'master' of ssh://git.sip-router.org/sip-router: kamctlrc: adding sca to the list of extra modules
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. :-)
/O
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
30 nov 2012 kl. 08:59 skrev Daniel-Constantin Mierla miconda@gmail.com:
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
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
On 11/30/12 9:03 AM, Olle E. Johansson wrote:
30 nov 2012 kl. 08:59 skrev Daniel-Constantin Mierla <miconda@gmail.com mailto:miconda@gmail.com>:
On 11/30/12 7:57 AM, Olle E. Johansson wrote:
29 nov 2012 kl. 22:54 skrev Ovidiu Sasosas@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 http://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!
Indeed, the parameters are important in this case. You can use them always to pull the remote, unless you have changes not committed in the local repository.
Cheers, Daniel
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
-
Daniel-Constantin Mierla -
Olle E. Johansson -
Ovidiu Sas