Team Explorer Everywhere Update 1

re: Team Explorer Everywhere Update 1

Martin Woodward (MSFT) — Thu, 03 Jan 2013 21:16:18 GMT

@Stefan - feel free to drop me a line personally (martinwo@microsoft.com) if you need any help with the conflict resolution stuff. The goal is to minimize the number of times that you get prompted to resolve a conflict but we should always tell you and give you a chance to correct before doing something that might result in a loss of any changes. So if you find something that is not working for you then please do drop me a line. Many thanks, Martin.

re: Team Explorer Everywhere Update 1

Stefan Drissen — Thu, 03 Jan 2013 18:03:39 GMT

Sorry about the above, it is not correct, the resolve conflict view is shown upon pressing the check in button.

Just seeing ghosts with a few changes wiped out since upgrading - this may be the result of automatic conflict resolution (which I now have turned off in the preferences).

re: Team Explorer Everywhere Update 1

Stefan Drissen — Thu, 03 Jan 2013 18:00:05 GMT

The automatic conflict resolution seems to be resolving conflicts incorrectly or incorrectly deciding that there is no conflict (when there is).

1. source checked out by user 1

2. source checked out by user 2

3. source checked in by user 1

4. source shelved by user 2

5. source unshelved by user 1

6. console reports that the server version is newer (which is correct)

But the conflict resolution perspective is not shown!!! If I now check in - I have wiped out user 1's changes.

If I perform get latest before checking in, then the conflict resolution perspective is shown and my merge program (kdiff3) will correctly solve the conflict.

re: Team Explorer Everywhere Update 1

Raul — Sat, 29 Dec 2012 00:39:11 GMT

This is a excelent part of the product, please keep pushing more features in this area

re: Team Explorer Everywhere Update 1

Allen Feinberg — Wed, 19 Dec 2012 18:04:49 GMT

Great work team! I love me my eclipse!