mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-04 11:53:18 +03:00
3cdce00170
The merge_virtual_branch_upstream, apply_branch, and update_base_branch functions had repetitive code for checking out conflicts. This commit refactors the code to use a new CheckoutIndexBuilder struct, which simplifies the checkout options and makes the code more readable. |
||
---|---|---|
.. | ||
icons | ||
src | ||
build.rs | ||
Cargo.toml | ||
tauri.conf.json | ||
tauri.conf.nightly.json | ||
tauri.conf.release.json |