mirror/profilarr
1
0
Fork 0
mirror of https://github.com/Dictionarry-Hub/profilarr.git synced 2025-12-23 23:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
main
profilarr/docs/diagrams
History
Sam Chau ca84a1c95b feature: merge conflict detection and resolution (#6) 
- 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
2025-02-05 16:09:58 +10:30
..
conflict-resolution.mmd
feature: merge conflict detection and resolution (#6)
2025-02-05 16:09:58 +10:30
sync-flow.md
feature: merge conflict detection and resolution (#6)
2025-02-05 16:09:58 +10:30