On Oct 08, 2009 at 15:17, Jan Janak <[email protected]> wrote: > On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson <[email protected]> wrote: > > > > 8 okt 2009 kl. 14.58 skrev Jan Janak: > > > >> On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson <[email protected]> wrote: > >>> > >>> 8 okt 2009 kl. 14.36 skrev Klaus Darilion: > >>> > >>>> > >>>> > >>>> Olle E. Johansson schrieb: > >>>>> > >>>>> 8 okt 2009 kl. 13.37 skrev Klaus Darilion: > >>>>>> > >>>>>> Hi Olle! > >>>>>> > >>>>>> Why do you edit the Kamailio trunk on sourceforge? > >>>>>> sourceforge repository is only used for patching older releases > >>>>>> (1.3,1.4 > >>>>>> and 1.5 branches). > >>>>>> > >>>>>> trunk is not used anymore, trunk-development happens on sip-router git > >>>>>> repository. > >>>>>> > >>>>> Just to test that I had access... :-) > >>>>> Now trying to get git access up and running too. > >>>> > >>>> Have fun! ;-) > >>> > >>> Already have... Had some changes to Makefile (to include ldap module) and > >>> did not want to commit that. Ended up removing it and now git says it's > >>> deleted... How on earth do I properly revert a change? > >> > >> git checkout <file> > >> > > > > Great. The mystery continues: > > > > 1x-193-157-197-57:sip-router.2 olle$ git push > > To ssh://[email protected]/sip-router > > ??! [rejected] ?? ?? ?? ??master -> master (non-fast forward) > > error: failed to push some refs to > > 'ssh://[email protected]/sip-router' > > This error means that your local repository is not up-to-date, in > other words you have modified an older version and git wants you to > pull the latest changes, resolve conflicts (if any) and then push > again. > > Run git pull and then try again.
No, you shouldn't run simple git pull, it will generate a useless merge commit. Use instead: git fetch origin; git pull --rebase --ff origin master See http://sip-router.org/wiki/git/commit-into-master. You should also look at: http://sip-router.org/wiki/git/sip-router-repository and http://sip-router.org/wiki/devel/git-commit-guidelines Andrei _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
