Skip to content

Allow the merge target to be changed or ignored #4258

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
Merged
merged 6 commits into from
Apr 30, 2025
Merged

Allow the merge target to be changed or ignored #4258

merged 6 commits into from
Apr 30, 2025

Conversation

@sergeibbb
Copy link
Member

@sergeibbb sergeibbb commented Apr 29, 2025 •
edited
Loading

Description

solves #4224

Edit button and its tooltip:

Branch selection, filtered by:

  • it's branch
  • it's remote (does it have to be remote?)

Consequences: a new command has been added:

Checklist

  • I have followed the guidelines in the Contributing document
  • My changes follow the coding style of this project
  • My changes build without any errors or warnings
  • My changes have been formatted and linted
  • My changes include any required corresponding changes to the documentation (including CHANGELOG.md and README.md)
  • My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
  • My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

@sergeibbb sergeibbb linked an issue Apr 29, 2025 that may be closed by this pull request
Allow the merge target to be changed or ignored #4224
Closed
1 task
@sergeibbb sergeibbb added the needs-verification Request for verification label Apr 29, 2025
sergeibbb pushed a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Saves a merge base branch defined by user
8bed6f1 
(#4224, #4258)
sergeibbb pushed a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Completes the change-merge-base command to let user pick a repo and b…
32c8c23 
…ranch

(#4224, #4258)
sergeibbb pushed a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Lets user reset their choice of Merge Target
f6030a4 
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Handles potential errors when retrieving the active repository
936871b 
Addresses a scenario where the active repository cannot be retrieved,
which commonly occurs when the currently open file is not part of a
repository.
A try-catch block is added to gracefully handle this situation,
logging the error and setting the active repository to undefined.
(#4224, #4258)
@sergeibbb sergeibbb force-pushed the 4224-change-merge-target branch from 328f8ef to 2dfdebd Compare April 29, 2025 13:37
sergeibbb added a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Describes changes in CHANGELOG
2dfdebd 
(#4224, #4258)
axosoft-ramint
axosoft-ramint reviewed Apr 29, 2025
View reviewed changes
sergeibbb added a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Describes changes in CHANGELOG
c9b3afc 
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 29, 2025
@sergeibbb
Simplifies the event name
63e3126 
(#4224, #4258)
@sergeibbb sergeibbb force-pushed the 4224-change-merge-target branch from 2dfdebd to 63e3126 Compare April 29, 2025 22:27
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Saves a merge base branch defined by user
188cf0d 
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Completes the change-merge-base command to let user pick a repo and b…
2a9f809 
…ranch

(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Lets user reset their choice of Merge Target
5749bdc 
(#4224, #4258)
@sergeibbb sergeibbb force-pushed the 4224-change-merge-target branch from 63e3126 to e3d5aa9 Compare April 30, 2025 12:47
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Handles potential errors when retrieving the active repository
5e821d2 
Addresses a scenario where the active repository cannot be retrieved,
which commonly occurs when the currently open file is not part of a
repository.
A try-catch block is added to gracefully handle this situation,
logging the error and setting the active repository to undefined.
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Describes changes in CHANGELOG
e3d5aa9 
(#4224, #4258)
@sergeibbb sergeibbb removed the needs-verification Request for verification label Apr 30, 2025
@sergeibbb
Saves a merge base branch defined by user
a221c19 
(#4224, #4258)
@sergeibbb
Completes the change-merge-base command to let user pick a repo and b…
c4d0e8a 
…ranch

(#4224, #4258)
@sergeibbb
Lets user reset their choice of Merge Target
2732583 
(#4224, #4258)
@sergeibbb
Handles potential errors when retrieving the active repository
9af6104 
Addresses a scenario where the active repository cannot be retrieved,
which commonly occurs when the currently open file is not part of a
repository.
A try-catch block is added to gracefully handle this situation,
logging the error and setting the active repository to undefined.
(#4224, #4258)
@sergeibbb
Describes changes in CHANGELOG
31dd3ec 
(#4224, #4258)
@sergeibbb
Improves description for a case when default target is undefined
85fff31 
(#4224, #4258)
@sergeibbb sergeibbb force-pushed the 4224-change-merge-target branch from e3d5aa9 to 85fff31 Compare April 30, 2025 13:19
axosoft-ramint
axosoft-ramint approved these changes Apr 30, 2025
View reviewed changes
Copy link
Contributor

@axosoft-ramint axosoft-ramint left a comment

Choose a reason for hiding this comment

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

LGTM

@sergeibbb sergeibbb merged commit 241f236 into main Apr 30, 2025
3 checks passed
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Saves a merge base branch defined by user
0aa1371 
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Completes the change-merge-base command to let user pick a repo and b…
cd99767 
…ranch

(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Lets user reset their choice of Merge Target
62589a3 
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Handles potential errors when retrieving the active repository
6877d81 
Addresses a scenario where the active repository cannot be retrieved,
which commonly occurs when the currently open file is not part of a
repository.
A try-catch block is added to gracefully handle this situation,
logging the error and setting the active repository to undefined.
(#4224, #4258)
sergeibbb added a commit that referenced this pull request Apr 30, 2025
@sergeibbb
Describes changes in CHANGELOG
8641615 
(#4224, #4258)
@sergeibbb sergeibbb deleted the 4224-change-merge-target branch April 30, 2025 19:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@axosoft-ramint axosoft-ramint axosoft-ramint approved these changes

@eamodio eamodio Awaiting requested review from eamodio

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Allow the merge target to be changed or ignored

2 participants

@sergeibbb @axosoft-ramint