A more recent version of filename is on this branch. Do you want to merge the file now?
- Explanation
- The version that you checked out is not the latest version on the branch.
(In another view, someone checked in one or more newer versions of this file.)
Because you can create versions only on the end of a branch, you must merge
the latest version with your changes before you check in.
- User action
- To merge the latest version with your changes, click Yes in
the Merge Latest Changes window. By default (Merge the file graphically is
clear), the Diff Merge tool starts only if your input is needed to complete
the merge.
Although you are prompted to check in the file
after the merge, consider verifying the merge results (for example, by opening
the file and viewing its contents) before checking in the file.
If
you do not merge the latest version with your changes, you cannot check in
your version of the file on the branch currently specified by your config
spec.
Merge the file graphically
Forces
the Diff Merge tool to start during the merge and disables automatic merge.
Set this option so that you can complete the merge through the graphical user
interface, even if the merge is trivial and does not require your input.