More git tools#107
Closed
devsoft-co-za wants to merge 3 commits intocecli-dev:mainfrom
Closed
Conversation
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
Collaborator
|
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: the are basically all things with a NORM_NAME -> the name to identify it with the tool registrar |
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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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