On Wednesday 28 October 2009 15:04:19 Andreas.Eversberg wrote:
what branch is it? do i need additional patches? i use the master with the RTP patch applied.
This information was in the initial mail the branch is called "holger/subscr- ref-handling". This branch is fixing a real life subscriber leak in the mncc_send routine. I would do the following to switch the branches. 1.) Check the name $ git branch -a ... origin/holger/subscr-ref-handling 2.) save my current work $ git stash 3.) create a local branch that tracks the other branch $ git checkout -b holger/subscr-ref-handling origin/holger/subscr-ref-handling 4.) apply my current work on top of it $ git stash apply 5.) resolve conflicts $ git mergetool I hope this information is helpful z.