gitbutler
gitbutler copied to clipboard
Inconsistent ownership claims
A user reported: "If two chunks have the same content but are in different lines, there is an error when committing."
In the logs it reports an error of "Inconsistent ownership claims"
That error is thrown from reconcile_claims
https://github.com/gitbutlerapp/gitbutler/blob/31dd8478ec59df6e3c4b77c86b0da10385b2af46/crates/gitbutler-core/src/virtual_branches/branch/ownership.rs#L130-L183
Which @krlvi introduced here:
https://github.com/gitbutlerapp/gitbutler/pull/3310