Conflicts

​

Where to View Conflicts

Conflicts are shown on changes in the Changes view. This could happen in either the Unstaged Changes or Staged Changes section, depending on the timing on the conflicting change.

If a local change is in the Unstaged Changes section when mudstack detects a conflict, that change cannot be staged and pushed till the conflict is resolved.

If the change has already been staged, and then the conflict is detected, it will not be included in the push till you resolve the conflict.

The conflicting change will show in an In Progress push in the Push History. You can select the push to see the details of that push, which should include the conflict as well for the file in question.

To resolve the conflict, click the Fix Conflict button. This will open a modal showing you the conflicting changes and give you the option to either select the cloud changes or your changes in order to resolve the conflict.

If there are multiple conflicts (for example, due to the location change of files), you can also batch select whether you want cloud or local changes to apply from this modal.

​

Resolving Data Conflicts

Changes to a file’s name, location, tags or libraries are considered data changes. A conflict can be triggered if you make changes to a file’s data locally and someone else has pushed changes to the same data for the file to the cloud.

If a data conflict occurs, either your local changes or the cloud changes will be overwritten depending on the action you take:

If you pull the cloud changes, your local changes will be removed.

If you push your local changes, the cloud will match your local changes.

​

Resolving File Version Conflicts

File version conflicts will occur if someone (e.g. Artist B) makes local changes to a file they pulled from the cloud, and then someone (e.g. Artist A) else creates and pushes a new version of the same file to the cloud first.

Whenever a file version conflict occurs, you will not lose any data if you keep cloud changes or push your local changes.

If you pull the cloud changes, your local changes will remain untouched and won’t affect the current version. The recently pulled version can be found in the file’s versions tab. You have the flexibility to choose any available version from that file and set it as the active version.

If you push your local changes, the cloud version tree will display a “broken” link connecting your version with the previous cloud version.