mirror of
https://github.com/Dictionarry-Hub/profilarr.git
synced 2026-01-22 02:41:11 +01:00
ca84a1c95b
- pulls now correctly identify merge conflicts and enter a merge state - user resolves each file individually - commit resolve merge state - allows users to keep custom changes and pull in updates - improve commit message component - seperated commit / add functionality
41 lines
1.3 KiB
Plaintext
41 lines
1.3 KiB
Plaintext
stateDiagram-v2
|
|
[*] --> CheckingForUpdates: User Initiates Pull
|
|
|
|
CheckingForUpdates --> NormalPull: No Conflicts Detected
|
|
CheckingForUpdates --> ConflictDetected: Conflicts Found
|
|
|
|
NormalPull --> [*]: Pull Complete
|
|
|
|
ConflictDetected --> ResolutionState: Enter Resolution Mode
|
|
note right of ResolutionState
|
|
System returns conflict object
|
|
containing all conflicted files
|
|
end note
|
|
|
|
state ResolutionState {
|
|
[*] --> FileSelection
|
|
|
|
FileSelection --> FileResolution: Select Unresolved File
|
|
|
|
FileResolution --> ConflictChoice
|
|
|
|
state ConflictChoice {
|
|
[*] --> DecisionMaking
|
|
DecisionMaking --> KeepLocal: User Keeps Local
|
|
DecisionMaking --> AcceptIncoming: User Accepts Incoming
|
|
DecisionMaking --> CustomMerge: User Combines/Modifies
|
|
|
|
KeepLocal --> MarkResolved
|
|
AcceptIncoming --> MarkResolved
|
|
CustomMerge --> MarkResolved
|
|
}
|
|
|
|
ConflictChoice --> AddFile: File Resolved
|
|
|
|
AddFile --> FileSelection: More Files\nto Resolve
|
|
AddFile --> AllFilesResolved: No More\nConflicts
|
|
}
|
|
|
|
ResolutionState --> CommitChanges: All Files Resolved
|
|
|
|
CommitChanges --> [*]: Resolution Complete |