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.

Sign up for GitHub

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

Jump to bottom

Issue warning if renaming branch with a remote tracking branch. #2775

Merged
merged 1 commit into from
Jan 7, 2024
Merged

Issue warning if renaming branch with a remote tracking branch. #2775

merged 1 commit into from
Jan 7, 2024

Conversation

essiene
Copy link
Contributor

@essiene essiene commented Jan 4, 2024 •
edited
Loading

Fixed #1457

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)

N/A

  • I have updated the config schema (cli/src/config-schema.json)

N/A

  • I have added tests to cover my changes

@essiene essiene force-pushed the rename_has_remote_warn branch from 6e0cdf4 to 3adbace Compare January 4, 2024 15:12
yuja
yuja reviewed Jan 5, 2024
View reviewed changes
cli/src/commands/branch.rs Outdated Show resolved Hide resolved
@essiene essiene force-pushed the rename_has_remote_warn branch 4 times, most recently from 017a753 to 88d78c9 Compare January 5, 2024 19:54
@essiene essiene marked this pull request as ready for review January 5, 2024 20:04
@essiene essiene requested review from yuja and martinvonz January 5, 2024 20:04
martinvonz
martinvonz reviewed Jan 5, 2024
View reviewed changes
cli/src/commands/branch.rs Outdated Show resolved Hide resolved
cli/tests/test_branch_command.rs Outdated Show resolved Hide resolved
yuja
yuja approved these changes Jan 6, 2024
View reviewed changes
cli/src/commands/branch.rs Outdated Show resolved Hide resolved
ilyagr
ilyagr reviewed Jan 7, 2024
View reviewed changes
Copy link
Contributor

@ilyagr ilyagr left a comment

Choose a reason for hiding this comment

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

Please fix a confusing typo in PR and commit title. "renaming", not "remaining".

@essiene essiene changed the title Issue warning if remaining branch with a remote tracking branch. Issue warning if renaming branch with a remote tracking branch. Jan 7, 2024
@essiene
Copy link
Contributor Author

essiene commented Jan 7, 2024

Please fix a confusing typo in PR and commit title. "renaming", not "remaining".

Whoops! Thanks. Fixed.

@essiene essiene closed this Jan 7, 2024
@essiene essiene reopened this Jan 7, 2024
@essiene essiene force-pushed the rename_has_remote_warn branch from 88d78c9 to a9466b4 Compare January 7, 2024 10:56
@martinvonz
Copy link
Member

Please fix a confusing typo in PR and commit title. "renaming", not "remaining".

Whoops! Thanks. Fixed.

Still there in the commit description.

@essiene essiene force-pushed the rename_has_remote_warn branch from a9466b4 to 02d886e Compare January 7, 2024 17:19
@essiene
Copy link
Contributor Author

essiene commented Jan 7, 2024

Please fix a confusing typo in PR and commit title. "renaming", not "remaining".

Whoops! Thanks. Fixed.

Still there in the commit description.

doh! fixed for real this time!

@essiene essiene requested a review from martinvonz January 7, 2024 17:28
@essiene essiene enabled auto-merge (rebase) January 7, 2024 17:32
martinvonz
martinvonz approved these changes Jan 7, 2024
View reviewed changes
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!

cli/tests/snapshots/test_branch_command__.snap Outdated Show resolved Hide resolved
@essiene essiene force-pushed the rename_has_remote_warn branch from 02d886e to db286d9 Compare January 7, 2024 17:37
@essiene essiene disabled auto-merge January 7, 2024 17:40
@essiene essiene merged commit 08d1809 into main Jan 7, 2024
15 checks passed
@essiene essiene deleted the rename_has_remote_warn branch January 7, 2024 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilyagr ilyagr ilyagr left review comments

@martinvonz martinvonz martinvonz approved these changes

@yuja yuja yuja approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

FR: jj branch rename
4 participants
@essiene @martinvonz @yuja @ilyagr