Resolving Conflicts

When multiple users are working in the same project file, Git conflicts might occur. Git conflicts transpire when another user commits changes to a file that you are working on before you commit your changes. If your changes clash with the other user's changes, you must view the differences between their commit and your changes and determine which changes to keep. You can either override their changes, discard your changes, or manually merge the two changes into one unified file. Workbench provides a GUI to view and resolve these conflicts.