Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Hi! I've done the above but I'm still not too sure about when jj abandon is applicable
(I just signed the CLA too)

Thanks for your contribution, the CLA will be valid after the next push.
At the moment your change is still missing a test to verify the new behavior.

I tried to address the comments and also added another separate hint for when there's commits with the same change id. Not too sure about tests yet since I don't know how to easily reproduce these situations.

Also thanks for the review!

Re PR description: it might be more accurate to say that this resolves a portion of #2192. There are also the other kinds of conflicts.

Update: I missed where you said that you added something about change ids. You should split that into a separate commit.

For the tests, you could base a test on one of the fetch tests:

https://github.com/martinvonz/jj/blob/8bfb6c10fd8781b8a8729719fe0826637b22c86d/cli/tests/test_git_fetch.rs#L295

Alternatively, you can also try adding a test there that does the equivalent of:

let pre_creation_id = test_env.current_operation_id(&repo_path);
test_env.jj_cmd_success(&repo_path, &["branch", "create", "a", "-r=one_commit"]);
test_env.jj_cmd_success(&repo_path, &["branch", "create", "a", "-r=another_commit",
                                      "--at-op", pre_creation_id]);

This could go into https://github.com/martinvonz/jj/blob/main/cli/tests/test_branch_command.rs. There aren't many tests with conflicted branches there at the moment, but they might be nice to have.

By the way, the tests should go either into the same commit where you make the change or in a commit before that, so that the commit where you make the change also changes the test.

Hi! I've added the tests in test_checkout.rs!

(The snippet didn't create a branch conflict for me when testing locally)

let pre_creation_id = test_env.current_operation_id(&repo_path);
test_env.jj_cmd_success(&repo_path, &["branch", "create", "a", "-r=one_commit"]);
test_env.jj_cmd_success(&repo_path, &["branch", "create", "a", "-r=another_commit",
                                      "--at-op", pre_creation_id]);

Hi, I believe I addressed all the requested changes! (Not sure if this is sufficient for the issue)

Hi, I believe I addressed all the requested changes! (Not sure if this is sufficient for the issue)

Thanks! I had started another round of reviewing and then got distracted. I'll finish that now

Hi, I just made the changes. Thanks for the feedback on the tests, it ended up being way simpler!