Martin von Zweigbergk 0aa738a518 view: add support for conflicting git refs in the model ... This adds support for having conflicting git refs in the view, but we never create conflicts yet. The `git_refs()` revset includes all "add" sides of any conflicts. Similarly `origin/main` (for example) resolves to all "adds" if it's conflicted (meaning that `jj co origin/main` and many other commands will error out if `origin/main` is conflicted). The `git_refs` template renders the reference for all "adds" and adds a "?" as suffix for conflicted refs. The reason I'm adding this now is not because it's high priority on its own (it's likely extremely uncommon to run two concurrent `jj git refresh` and *also* update refs in the underlying git repo at the same time) but because it's a building block for the branch support I've planned (issue #21).		2021-07-24 19:01:56 -07:00
..
op_store.proto	view: add support for conflicting git refs in the model	2021-07-24 19:01:56 -07:00
store.proto	protobuf: generate code at build-time	2020-12-24 01:05:17 -08:00
working_copy.proto	protobuf: generate code at build-time	2020-12-24 01:05:17 -08:00