forked from mirrors/jj
e901a4e66b
Since the working copy can now handle conflicts, we don't need to materialize conflicts when checking out a commit. Before this patch, we used to create a new commit on top whenever we checked out a commit with conflicts. That new commit was intended just for resolving the conflicts. The typical workflow was the resolve the conflicts and then amend. To use the same workflow after this patch, one needs to explicitly create a new commit on top with `jj new` after checking out a commit with conflict. |
||
|---|---|---|
| .. | ||
| benches | ||
| protos | ||
| src | ||
| tests | ||
| build.rs | ||
| Cargo.toml | ||