Hi,<br><br><div class="gmail_quote">2011/3/29 Carsten Bock <span dir="ltr">&lt;<a href="mailto:lists@bock.info">lists@bock.info</a>&gt;</span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">


<br>
If i create a branch for specific extensions (e.g. the P-CSCF) and i<br>
need to implement other features for this (e.g. general RFC3680<br>
support in the presence modules), is there a proper way, to keep my<br>
branch up-to-date with the current master and afterwards doing a clean<br>
merge? If i do a &quot;git pull&quot; and afterwards merge, the changelog gets<br>
duplicated... any ideas?<br></blockquote><div><br>The workflow described here: <a href="http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html">http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html</a> works for me just fine<br>

<br>Best regards,<br><br>Santi<br></div></div>