git-sync/profilarr
1
0
Fork 0
mirror of https://github.com/Dictionarry-Hub/profilarr.git synced 2026-01-22 10:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
215 Commits 5 Branches 22 Tags
ca84a1c95b3a14eb3806039bc705c484a4507d9b
Commit Graph

2 Commits

Author SHA1 Message Date
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
Sam Chau
f7f4855953 refactor: adjust git file names 2025-02-05 16:09:58 +10:30