Module: sip-router Branch: master Commit: 654a15281ad42a92076bfd131d95b3e7c5cb240f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=654a1528...
Author: Anca Vamanu anca.vamanu@1and1.ro Committer: Anca Vamanu anca.vamanu@1and1.ro Date: Thu Mar 8 17:47:23 2012 +0200
Merge branch 'master' of ssh://git.sip-router.org/sip-router
---
to avoid this merge branch 'master' notification (like in the subject), before pushing to remote repository, the developer has to synch with remote repo and rebase the local copy, command:
git pull --ff --rebase origin
The notification is done when the local commit is older than the last commit from the remote repository, or the remote has newer commits since local copy was pulled.
It is safe to run the command always before pushing, no matter the sync state between local and remote.
Cheers, Daniel