Resolving conflicts in mudstack.
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.
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.