Re: Merge, undetected tree conflict when source tree moves directory

2011-04-30 Thread Stefan Sperling
On Sat, Apr 30, 2011 at 06:29:19PM +0200, Paolo Compieta wrote: > Hi, > this is a first post, hope it's well written and clear. I've found this > (candidate-)bug while at work, and it's a big problem for my company. > I'm posting this to ask if it's a known bug (i haven't found anything > similar i

Merge, undetected tree conflict when source tree moves directory

2011-04-30 Thread Paolo Compieta
Hi, this is a first post, hope it's well written and clear. I've found this (candidate-)bug while at work, and it's a big problem for my company. I'm posting this to ask if it's a known bug (i haven't found anything similar in the issue tracker, hope i did the right searches) or if it's some stupid