29 Mar
2011
29 Mar
'11
12:47 p.m.
Hi Santiago,
thanks, that is quite useful!
Carsten
2011/3/29 Santiago Gimeno <santiago.gimeno(a)gmail.com>om>:
Hi,
2011/3/29 Carsten Bock <lists(a)bock.info>
--
Carsten Bock
http://www.ng-voice.com
mailto:carsten@ng-voice.com
If i create a branch for specific extensions (e.g. the P-CSCF) and i
need to implement other features for this (e.g. general RFC3680
support in the presence modules), is there a proper way, to keep my
branch up-to-date with the current master and afterwards doing a clean
merge? If i do a "git pull" and afterwards merge, the changelog gets
duplicated... any ideas?
The workflow described here:
http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html works
for me just fine
Best regards,
Santi