When I'm performing a large merge onto a branch that has some files checked out, it sometimes fails because it wants to merge some files that are exclusively checked out to other users.
If it's a large merge its very difficult to figure out which files need to be checked in to make the merge successful. It would be nice to show a list of files that need to be checked in, so I don't need to go 1 by 1 through the list.
It's not always easy to ask the developers to check everything in.
Thanks,
Mike Ballou
Feature request - show failed checkout files in merge
Moderator: SourceGear
There should be a screen in the Merge Branches wizard that displays a list of the files that it failed to check out (it tries to check them out exclusively, so that any file that is checked out by anyone will cause the Merge Branches checkout to fail).
In fact, if the checkout fails, it does not allow the Merge Branches operation to continue. You should be able to select the files from this screen to determine which files need to be checked in by other developers.
In fact, if the checkout fails, it does not allow the Merge Branches operation to continue. You should be able to select the files from this screen to determine which files need to be checked in by other developers.