梦曦·花已落
If the target branch(master) conflicts with the virtual branch(workspace), does that mean we can't resolve it using other tools?
Does this mean I can merge the integration branch with the master and resolve conflicts (using other tool)?
Is the “GitButler Integration Commit“ in the integration branch something we don't need to pay attention to? I'm concerned that merging might affect it.
Since gitbutler's branches seem to be named randomly, using other tools for conflict resolution and then cutting back to gitbutler doesn't work
This actually brings me to the multiple working branches I mentioned earlier, where I'm rebasing one working branch against another, which gitbutler doesn't have the ability to do at the...
Would this be an ability to delete local or remote branches similarly? @krlvi
I am using the gitlab repository too. I even use dua to count the size of git files. hh
> I may not be able to reproduce my problem with a simple demo, but I'll take a problem that I encountered in an actual project. @Byron This may be...
For the above reasons, this resulted in me having to only create a new virtual branch, thus realizing the problem in the beginning