Files
profilarr/backend/app/git/operations/commit.py
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

17 lines
466 B
Python

# git/operations/commit.py
import git
import logging
logger = logging.getLogger(__name__)
def commit_changes(repo_path, files, message):
try:
repo = git.Repo(repo_path)
repo.index.add(files)
repo.index.commit(message)
return True, "Successfully committed changes."
except Exception as e:
logger.error(f"Error committing changes: {str(e)}", exc_info=True)
return False, f"Error committing changes: {str(e)}"