mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-23 23:10:01 +00:00
6b1ccd4512
When there are two concurrent operations, we would resolve conflicting updates of git refs quite arbitrarily before this change. This change introduces a new `refs` module with a function for doing a 3-way merge of ref targets. For example, if both sides moved a ref forward but by different amounts, we pick the descendant-most target. If we can't resolve it, we leave it as a conflict. That's fine to do for git refs because they can be resolved by simply running `jj git refresh` to import refs again (the underlying git repo is the source of truth). As with the previous change, I'm doing this now because mostly because it is a good stepping stone towards branch support (issue #21). We'll soon use the same 3-way merging for updating the local branch definition (once we add that) when a branch changes in the git repo or on a remote. |
||
|---|---|---|
| .. | ||
| benches | ||
| protos | ||
| src | ||
| tests | ||
| build.rs | ||
| Cargo.toml | ||