Skip to content

Conversation

glehmann
Copy link
Contributor

@glehmann glehmann commented Oct 10, 2025

We shouldn't be in that case, and it can lead to confusing situations with next completely switching branch.

fix: #7046

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added/updated tests to cover my changes

@glehmann glehmann requested a review from a team as a code owner October 10, 2025 07:49
@glehmann glehmann mentioned this pull request Oct 10, 2025
4 tasks
@glehmann glehmann force-pushed the gln/no-edit-children-error-pxlp branch from a77c40b to 2f9af19 Compare October 10, 2025 08:11
@glehmann glehmann force-pushed the gln/no-edit-children-error-pxlp branch from 2f9af19 to db7641a Compare October 11, 2025 12:02
@PhilipMetzger
Copy link
Contributor

I'm fine with this patch even though I raised some concerns in the aforementioned issue. Maybe this will make it more intuitive to users so LGTM.

@glehmann glehmann force-pushed the gln/no-edit-children-error-pxlp branch 2 times, most recently from be6b9ae to 2a47b55 Compare October 13, 2025 15:51
@glehmann glehmann force-pushed the gln/no-edit-children-error-pxlp branch from 2a47b55 to 8bbaccf Compare October 13, 2025 19:30
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@glehmann glehmann force-pushed the gln/no-edit-children-error-pxlp branch 4 times, most recently from b18d0d2 to 6235b23 Compare October 15, 2025 21:13
…s children

We shouldn't be in that case, and it can lead to confusing situations with next
completely switching branch.

fix: jj-vcs#7046
@glehmann glehmann force-pushed the gln/no-edit-children-error-pxlp branch from 6235b23 to 309a4e7 Compare October 17, 2025 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make jj next (without --edit) when on non-head commit an error?

3 participants