Clarify squashing working-copy commit

[ilyapoz]

Discord discussion: https://discord.com/channels/968932220549103686/1137103019792683110

[google-cla]

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.

[ilyagr]

It might take some work to sync this with main after #1978. There's no perfect way since jj currently doesn't understand file moves.

Let me/us know if you'd like some help with that, or if you figure out a good way. You might want to do this after you fix all the things that need fixing.

One conjecture I have is that git rebase might actually work better than jj rebase in this case.

Another way I might try to do this would be to rebase your commit to main and look if the conflicted src/commands/mod.rs is readable. If not, I'd do jj restore src/commands/mod.rs --from before_that_PR. Either way, I'd then manually diff src/commands/mod.rs and whatever its new name is.

[ilyapoz]

@ilyagr It's ok, I'm not full time jj user yet. This PR was created via guthub UI. I rebased it using git no problem. I've just started using jj for my personal project yesterday, I will keep it simple :)

I have good enough git expertise, recently I cherry-picked 1000 commits between two branches on my job :)))

[martinvonz]

LGTM with the minor remaining suggestions fixed

[avamsi]

Also, please squash your incremental commit (and consider prefixing the original commit with cli: ), see https://github.com/martinvonz/jj/blob/main/docs/contributing.md#code-reviews.

[ilyapoz]

How to fix formatting automatically? I ran cargo fmt but it does not work on my setup (brew). Sorry, I'm not familiar with rust

[ilyagr]

You likely need to install nightly rust and run `cargo +nightly fmt`. This is described in a little more detail in docs/contributing.md.

…

On Tue, Sep 5, 2023, 5:03 AM Ilia Pozhilov ***@***.***> wrote: How to fix formatting automatically? I ran cargo fmt but it does not work on my setup (brew). Sorry, I'm not familiar with rust — Reply to this email directly, view it on GitHub <#1980 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AA7OTJZM6YVM3PKACUQHL43XY4IJ7ANCNFSM6AAAAAA3EV4LLU> . You are receiving this because you were mentioned.Message ID: ***@***.***>