[sr-dev] problem with tracking master

[Henning Westerholt]

On Thursday 08 September 2011, Juha Heinanen wrote:
> Henning Westerholt writes:
> > 'git rm pkg/kamailio/gentoo -r' should help to resolve the conflict.
> 
> henning,
> 
> that removed the conflict, although i don't understand how the conflict
> was possible in the first place, because i have never touched that
> directory in any branch.

Hi Juha,

yes, its strange. Not sure if had some local changes in the 3.1 tree and 
therefore git was not able to remove that directory completely, but this still 
would not explain your problem.

Best regards,

Henning