gitbutlerapp
Merge virtual branches together
Version
0.12.12
Operating System
Mac OS X
Distribution Method
dmg (Apple Silicon)
Describe the issue
I am just starting with GitButler and I love the idea of virtual branches but I am having some issues trying to include them into my current workflow.
On a personal project, I have my production branch being origin/main and then I have origin/develop for QA. I set my trunk as origin/main in GitButler, and created a branch/lane for origin/develop. Then, I create virtual branches as needed for new features or bug fixes.
After finishing working on a feature or bug fix, I would like to merge the corresponding branch into develop and push the changes (which will deploy to my QA environment). I do not need or want to open MRs.
I do not see any way to merge these virtual branches together. The only workaround I found is to drag the individual commits, but it has two problems. First, it takes time, specially when you have a lot of commits. Secondly, I am forced to do it in the reverse order (latest commit needs to be dragged first).
How to reproduce
No response
Expected behavior
It would be nice to have a way to merge one virtual branch into another
Relevant log output
No response
Thanks a lot for describing your workflow so precisely, I could picture it very well and hope that more workflow will be supported over time. CC @krlvi just to have seen it.
I recently encountered the same problem (having two virtual branches and wanting to merge into a single branch). Has this been solved?
There is no built-in functionality for this, but you could unapply both, merge one into the other with Git, and then re-apply the merged branch.
It's already possible today to drag and drop branch segments, which would allow stacking independent branches (rebasing on top of the other). But merging them isn't actually planned right now, but it's thinkable to make merging easier in future to support fully-local workflows.