search

gitbutlerapp / gitbutler

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

When applying a branch always rebase if there are no change IDs #5636

Closed krlvi closed 2 days ago

krlvi commented 2 days ago

This change makes it so that when a branch is applied, if the head does not have a change ID (i.e. was not created with gitbutler), the commits will be rebased even if the base is the same as the workspace. This will populate the change ID headers.

This resolves issues related to stacking which relies on change IDs

vercel[bot] commented 2 days ago

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-components ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 20, 2024 7:04pm
gitbutler-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 20, 2024 7:04pm