Check In

After a file is checked out and edited, the modifications can be added to the database by performing a Check In operation.

Check In Individual Files

To check in one or more files, first highlight the edited files from the File List. Then, click the Check In button or select the Check In command from either the Source menu or by right-clicking. Check In comments can be added in the Comment field of the Check In dialog. Additional Check In options that may be selected from the Check In dialog include Keep Checked Out and Remove Local Copy.

Check In All Files in a SCC Project

A check in command may be performed at the project level. To check in all files in a project, highlight the project in the Project List. Then, click the Check In button or select the Check In command from either the Source menu or by right-clicking.

Check in comments may be added in the Comment field of the Check In dialog. Any comments added at this time will be globally applied to all files concurrently being checked in. Additional check in options that may be selected from the Check In dialog include Keep Checked Out, Remove Local Copy and Recursive. The Recursive option will also check in all of the files in the subprojects of the selected project.

During the check in operation, you can also automatically update the Bug Tracking Database.

Checking in from Multiple File Checkouts

In a multiple check out situation, SOS Collab supports the Check In operation in the following way:

• Upon check in, SOS Collab will attempt to do an automatic merge.
• If there are no conflicting changes, then the Check In operation proceeds with no user intervention. The local version is replaced with the merged version from the SourceSafe database.
• If there are conflicting changes, SOS Collab will notify the client of conflicts and attempt to launch the third party merge utility that is configured under Tools->Options-> SCC Settings->External Programs.
• After manually resolving the conflicts, the user is given another chance to resubmit the file for check in. The user can utilize the Show Differences operation within SOS Collab to find the conflicting edits.
• If the user would like to check the file in anyway, the second time a Check In operation is performed, it will succeed. The file will be checked in as a new version. The previous version of the file will contain the conflicting changes. A Diff operation from the Show History dialog will highlight the conflicting changes between the two versions of the file.