Description

jj new fired the ...updates were skipped because there were conflicting changes in the working copy warning, but no files in my working directory seem to actually be affected.

Steps to Reproduce the Problem

jj new ...

Expected Behavior

No warning to be fired.

Actual Behavior

winter@Winters-MacBook-Pro ~/s/nixpkgs> jj new master
Working copy  (@) now at: oxmplluk 09e66bba (empty) (no description set)
Parent commit (@-)      : vxqsvysu 7d8a6233 master | (empty) source2viewer-cli: 20.0 -> 20.1 (#579328)
Added 1075 files, modified 8741 files, removed 639 files
Warning: 1 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 09e66bba242d`.
Discard the conflicting changes with `jj restore --from 09e66bba242d`.

winter@Winters-MacBook-Pro ~/s/nixpkgs> jj st
The working copy has no changes.
Working copy  (@) : oxmplluk 09e66bba (empty) (no description set)
Parent commit (@-): vxqsvysu 7d8a6233 master | (empty) source2viewer-cli: 20.0 -> 20.1 (#579328)

winter@Winters-MacBook-Pro ~/s/nixpkgs> jj diff --from 09e66bba242d
winter@Winters-MacBook-Pro ~/s/nixpkgs> jj restore --from 09e66bba242d
Nothing changed.

Specifications

Platform: macOS
Version: jj 0.45.1

Activity

josephlou53d ago

Seems you're on a MacBook, which is a case-insensitive system. The "conflicting changes" might actually just be two file paths that "look" different but are actually the same according to the system. But if your working copy has no changes and the jj diff --from command gave nothing too, then I'm not quite sure how you can find out what the conflicting path is.

There was a recent Discord question that seems similar.