maiao icon indicating copy to clipboard operation
maiao copied to clipboard

Feature Request: Ability to pick commits out to merge directly to main

Open rieger-jared opened this issue 4 months ago • 1 comments

In my development workflow, I often create commits encompassing refactoring, fixes, and other changes unrelated to new features. It's crucial that these changes are not hindered. While one workaround involves organizing commits so that feature-related ones come last, this still results in non-dependent commits relying on the initial commit.

To address this, I manually create a new branch, cherry-pick the independent commit, and initiate a new pull request. However, I believe this process could be streamlined using our tools.

Currently, our tool employs a conventional atomic commit and pull request strategy, creating a stack where subsequent commits depend on the approval of the initial one. This is effective for related dependent commits, like a new feature.

However, a common practice, including in my workflow, involves having commits unrelated to the current feature within the same stack. This, I believe, needlessly obstructs these commits, preventing them from being merged directly into the trunk branch without their original parent.

I propose the implementation of a CLI interface, allowing users to selectively include commits in the stack. For the remaining unselected commits, separate branches could be created, facilitating direct merging into the trunk. This process might involve creating new branches off the main branch and cherry-picking the desired commit.

One challenge with this approach is the potential lack of synchronization between the origin and local branches. Addressing this issue would be crucial for seamless integration.

What do you all think?

image

rieger-jared avatar Feb 14 '24 11:02 rieger-jared