-
Type: Improvement
-
Status: Resolved
-
Priority: Critical
-
Resolution: Fixed
-
Affects Version/s: 25
-
Fix Version/s: 32
-
Component/s: Versioning & Branch management
-
Epic Link:
-
Tags:
-
Sprint:TGV 03
-
Story Points:2
Conflicts can appear during a rebase or a merge. If the process of resolution is interrupted (could be a refresh in the browser, a click outside the popup, etc), the repo will stay in a conflict state and it will not be possible to load properly the project.
If a rebase was in process, an abort must done. If a merge was in process, a reset on HEAD must be done.
- depends on
-
NXS-2776 We should prevent the conflict management popup from disappearing unless user selected a conflict resolution option
- Resolved