As you could notice in CTP1 or CTP2, new Resolve Dialog displays detailed information about selected conflict. This information is partially calculated on the background and can involve some time consuming operation. Right now they are:
- attempt to merge the content – we say if there are content change in both source and target, if they can be automatically automerged etc.
- query the history to display edits on the server/target branch. Right now we display list of last 2 changes. This includes their numbers as links (clicking one of them brings up changeset dialog) and tooltip with changeset number , owner and comment
If you can think of any other analysis that would be useful and that can be calculated for the conflict – let us know!