Feature Request: Cooperative mode, Aider commit changed code to another branch, and I selectively merge them to my branch
Closed this issue · 3 comments
Hello @paul-gauthier !
I'm surprised by Aider when I first see its workflow. However when using it, I found that it is hard for Aider to do things right the first time, I have to repeatedly undo and adjust my prompts to make it try to do things better. During my experience of Aider, I observed that in a decent percent of cases, Aider generated code contains some useful changes, but it also contains unwanted changes. (Mainly because I'm using local LLM)
And currently I have to /undo, because I cannot control those changes in fine grain, and it is troublesome to pick those useful changes out of undo-ed commits, because they are in current branch and has already been deserted.
So I think: There could be a Cooperative mode, in which Aider commits its changed code to another dedicated branch, and I selectively pick out those useful changes and merge into my branch, then when Aider works again, it first switch back to its branch and sync from my branch. In this way we can utilize Aider's work at most degree.
I didn't found familiar things in document, wish this cooperative mode can be brought into Aider.
Thanks for trying aider and filing this issue. This doc may be helpful:
https://aider.chat/docs/git.html
You can use raw git commands to perform the workflow you're describing.
I'm labeling this issue as stale because it has been open for 2 weeks with no activity. If there are no additional comments, it will be closed in 7 days.
I'm closing this issue because it has been stalled for 3 weeks with no activity. Feel free to add a comment here and we can re-open it. Or feel free to file a new issue at any time.