search

gitbutlerapp / gitbutler

The GitButler version control client, backed by Git, powered by Tauri/Rust/Svelte
https://gitbutler.com
Other
12.43k stars 488 forks source link

Visual conflict resolution interface #4681

Open LovesAsuna opened 4 weeks ago

LovesAsuna commented 4 weeks ago

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

Byron commented 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.

LovesAsuna commented 3 weeks ago

If the target branch(master) conflicts with the virtual branch(workspace), does that mean we can't resolve it using other tools?

Byron commented 3 weeks ago

Actually, that's exactly how it works today - one sees conflicts markers in the worktree files and can resolve them there.

LovesAsuna commented 3 weeks ago

Does this mean I can merge the integration branch with the master and resolve conflicts (using other tool)?

Byron commented 3 weeks ago

Yes, that is the intended workflow.

LovesAsuna commented 3 weeks ago

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.

Byron commented 3 weeks ago

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).