mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-27 23:06:45 +00:00
da0bbbe637
Git refs are important at least for understanding where the remote branches are. This commit adds support for tracking them in the view and makes `git::import_refs()` update them. When merging views (either because of concurrent operations or when undoing an earlier operation), there can be conflicts between git ref changes. I ignored that for now and let the later operation win. That will probably be good enough for a while. It's not hard to detect the conflicts, but I haven't yet decided how to handle them. I'm leaning towards representing the conflicting refs in the view just like how we represent conflicting files in the tree. |
||
|---|---|---|
| .. | ||
| protos | ||
| src | ||
| tests | ||
| build.rs | ||
| Cargo.toml | ||