Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli git push: clearer user-facing messages #3765

Merged
merged 1 commit into from
Jun 2, 2024
Merged

Conversation

ilyagr
Copy link
Collaborator

@ilyagr ilyagr commented May 27, 2024

"Move forward" instead of "Move", "Move sideways" or "Move backward"
instead of (now misleading) "Force...".

Previously discussed in #3522 (comment), and based on that PR (which contains 8 of the currently 9 commits).

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 tests to cover my changes

@ilyagr ilyagr force-pushed the fwl-msg branch 3 times, most recently from ceec404 to aadc1ee Compare June 1, 2024 02:10
@ilyagr ilyagr marked this pull request as ready for review June 1, 2024 02:16
@ilyagr ilyagr force-pushed the fwl-msg branch 4 times, most recently from e216018 to f2ed9ac Compare June 1, 2024 03:03
cli/src/commands/git.rs Outdated Show resolved Hide resolved
cli/src/commands/git.rs Outdated Show resolved Hide resolved
@ilyagr
Copy link
Collaborator Author

ilyagr commented Jun 1, 2024

The refactor commit is now #3811. I can also include that commit here, but there seems to be no harm in reviewing it separately (and there is no time pressure on that PR).

Copy link
Collaborator

@yuja yuja left a comment

Choose a reason for hiding this comment

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

Thanks!

cli/src/commands/git.rs Outdated Show resolved Hide resolved
@ilyagr
Copy link
Collaborator Author

ilyagr commented Jun 2, 2024

Thank you, Yuya!

"Move forward" instead of "Move", "Move sideways" or "Move backward"
instead of (now misleading) "Force...".
@ilyagr ilyagr enabled auto-merge (rebase) June 2, 2024 01:34
@ilyagr ilyagr disabled auto-merge June 2, 2024 01:35
@ilyagr ilyagr enabled auto-merge (rebase) June 2, 2024 01:35
@ilyagr ilyagr merged commit b1e5ca5 into jj-vcs:main Jun 2, 2024
16 checks passed
@ilyagr ilyagr deleted the fwl-msg branch June 2, 2024 01:42
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.

2 participants