forked from mirrors/jj
8738421990
Now that we have our own representation of branches and tags, let's update them when we import git refs. The View object's git refs are now just a record of what the refs are in the underlying git ref last time we imported them (we don't -- and won't -- provide a way for the user to update our record of the git refs). We can therefore do a nice 3-way ref-merge using the `refs` module we added recently. That means that we'll detect conflicts caused by changes made concurrently in the underlying git repo and in jj's view. |
||
|---|---|---|
| .. | ||
| benches | ||
| protos | ||
| src | ||
| tests | ||
| build.rs | ||
| Cargo.toml | ||