To view conflicts

  1. Click the Diff. and History tab in the lower pane of the Commit Browser.
  2. Click Show Difference... to display a report that lists all conflicts between the selected local and remote sources.
  3. Review the conflicts that are displayed in the pane. They might be colored differently, or they might be marked with a conflict tag, depending on the source control system you are currently using.

Note: If there are no conflicts, the system displays a confirmation alert to that effect.

4. When you have resolved the conflicts in your files, initiate the Commit Browser again and recommit the files.

Project Management Made Easy

Project Management Made Easy

What you need to know about… Project Management Made Easy! Project management consists of more than just a large building project and can encompass small projects as well. No matter what the size of your project, you need to have some sort of project management. How you manage your project has everything to do with its outcome.

Get My Free Ebook


Post a comment