How to merge multiple conflicting revisions?

[MarcellGranat]

Dear community,

I am using jj since a few weeks, but I failed to find a way for the following. As I did (yes, I did) a lot of changes in one html file with copilot, I started a new revision each time to be able to abandon them if I need to. Now I have plenty of revisions without desc, and I want to squash them into a single one, which is stopped as jj shows me I have conflicts. How to force it to go with the newest version?

Many thanks in advance 🙏

[jennings]

Find the first commit x and the last one you want to squash y, then run:

jj squash --from x..y --to x

You could also restore the contents of the last commit int the first then abandon the rest:

jj restore --into x --from y
jj abandon x..y