Commit Graph

6 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
santiagosayshey
525d86063d Initial Commit 2025-02-05 16:09:58 +10:30
Sam Chau
28e0cad4a1 Clean slate 2025-02-05 16:09:33 +10:30
santiagosayshey
a7329fb1ef improved dev testing suite
- adjusted compose file to store config data
- ignoring configs and data for version history
- adjusted setup script to make second instance the dev instance
2024-05-11 03:25:11 +09:30
santiagosayshey
c22385335e v0.2.4
## Features
- Implemented #12 
- Enhanced message formatting and user prompts for deletions.

## Additions
- ETHEL SCENE release group added.
- FLiGHTS group to missing HDR10.
- Overhauled h265 custom formats and added new h265 4k format.
- MAX WEB source added to custom formats.

## Improvements
- Script to generate initial config file.
- Removed tracking of config.yml for security.
- Updated README for install process and new delete feature.
2024-02-03 11:32:04 +10:30
santiagosayshey
68852b3f19 Initial commit 2023-09-29 17:22:09 +09:30