Merge conflicts - LOCAL vs REMOTE flipped

Aug 25, 2012 at 12:35 AM

When I encounter a merge conflict I get several files:

myfile.txt.REMOTE
myfile.txt.LOCAL
myfile.txt

My local changes appear in myfile.txt.REMOTE while my coworker's changes appear in myfile.txt.LOCAL. I expected the opposite.

I am using git tf pull --rebase.

Thanks,
Brian

Developer
Aug 25, 2012 at 3:17 AM

Hello Brian, 

Thanks for reporting the issue. this is for sure a bug. I will file a bug to track fixing this issue. Thanks for reporting it.

Thanks, 

Youhana

Developer
Aug 30, 2012 at 8:00 PM

I created an issue to track this bug : http://gittf.codeplex.com/workitem/15