santiagosayshey df16d7c52f fix: merge/delete conflicts (#151) ...

feat: enhance merge conflict handling with improved status messages and conditional rendering
feat: improved modify / delete conflict handling
- fix ours/theirs messages for deleted files
- fix handling of choice moniker
- fix parsing of local/incoming name when deleted

2025-02-26 18:11:35 +10:30

..

commit_history.py

feature: quality profile improvements (#9)

2025-02-05 16:09:59 +10:30

comparison.py

improvements: whole lotta stuff (#18)

2025-02-05 16:09:59 +10:30

conflict_comparison.py

fix: merge/delete conflicts (#151)

2025-02-26 18:11:35 +10:30

incoming_changes.py

feat: Rename / Status Improvements (#142)

2025-02-17 07:06:11 +10:30

merge_conflicts.py

fix: merge/delete conflicts (#151)

2025-02-26 18:11:35 +10:30

outgoing_changes.py

feat: Rename / Status Improvements (#142)

2025-02-17 07:06:11 +10:30

status.py

feat: Rename / Status Improvements (#142)

2025-02-17 07:06:11 +10:30

utils.py

refactor: improve and move type / scope tags to diff modal

2025-02-05 16:09:58 +10:30