Skip to content

More git tools#107

Closed
devsoft-co-za wants to merge 3 commits intocecli-dev:mainfrom
devsoft-co-za:more_git_tools
Closed

More git tools#107
devsoft-co-za wants to merge 3 commits intocecli-dev:mainfrom
devsoft-co-za:more_git_tools

Conversation

@devsoft-co-za
Copy link
Copy Markdown

I have added branch and remote options to the git tool.
Now we can list branches and remotes.

Example prompts: "which branch is the remote in sync with?", "list the orphaned branches"
This can work well in combination with the diff and show commands to grasp changes across branches.

What we can't do with the git.py tool: merge, commit, switch branches and add/remove remotes... all potentially dangerous actions.

I would love to add merge conflict handling especially but I am very aware of the complexity of this type of operation. During Covid I implemented a 3 way diff conflict resolution system for a client - resolving conflicts caused by collaborative editing of a shared spreadsheet. Anyway, I will look into it, and see if it can be done in a way that doesn't end up breaking peoples projects. In the meantime if people want to do destructive git operations they have the command.py

tomjuggler and others added 3 commits November 6, 2025 20:11
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
@dwash96
Copy link
Copy Markdown
Collaborator

dwash96 commented Nov 9, 2025

Hey, thank you! Can you review v0.88.11, I refactored the local tools a bit to have a common schema, here's an example:
https://github.com/dwash96/aider-ce/blob/v0.88.11/aider/tools/git_log.py

the are basically all things with a

NORM_NAME -> the name to identify it with the tool registrar
schema -> the actual tool schema
process_response() -> to perform basic response validation
{some named execution function}() -> that handles processing a valid response for the tool

@devsoft-co-za
Copy link
Copy Markdown
Author

OK that makes a lot of sense. I will update to use the new system asap

I am closing this and re-submitting a new PR due to the re-factor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants