Open LovesAsuna opened 4 weeks ago
Thanks a lot for asking! Maybe @krlvi knows the answer.
Meanwhile, I'd like to mention #3048 as one way of dealing with this would be to make the conflicts available in Git so existing tools can be used to resolve them.
If the target branch(master) conflicts with the virtual branch(workspace), does that mean we can't resolve it using other tools?
Actually, that's exactly how it works today - one sees conflicts markers in the worktree files and can resolve them there.
Does this mean I can merge the integration branch with the master and resolve conflicts (using other tool)?
Yes, that is the intended workflow.
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.
It's an artificial and 'managed' commit which is used to show which virtual branches are currently visible, but it won't itself be subject to traditional merges (as long as the user doesn't run git merge
manually, that is).
Version
0.12.19
Operating System
Mac OS X
Distribution Method
dmg (Apple Silicon)
Describe the issue
Are there any plans to update a visual conflict resolution interface? Ideally, I’m looking for a conflict resolution tool integrated into the IDE, similar to JetBrains, or a UI tool like Fork or GitKraken.
How to reproduce
No response
Expected behavior
No response
Relevant log output
No response