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

Creating a new local branch in Git UI will not checkout the default merge branch prior #591

Closed
raymond-rebbeck opened this issue Oct 29, 2024 · 1 comment · Fixed by #595
Assignees
Labels
bug Something isn't working customer Based on customer feedback (as opposed to something identified by developers) usability

Comments

@raymond-rebbeck
Copy link
Contributor

raymond-rebbeck commented Oct 29, 2024

When creating a new branch within Studio using the 'Create a new branch' menu option, it will checkout the default merge branch first, then create the new branch. This is helpful and helps to avoid issues with developers inadvertently creating branches off feature branches that are not merged yet.

However creating a new branch in Git UI does not have this behaviour and will create a branch directly off a feature branch unexpectedly, which has caused issues with some of our developers who are still getting their heads around Git concepts and it's not realised what has potentially happened until a PR is submitted and unexpected commits are discovered during review.

Being able to create a new branch in Git UI has proven to be more attractive and noticeable to developers, who are otherwise doing a lot of Git tasks within the Git UI, compared to closing Git UI and going to a menu option.

image

IRIS for UNIX (Ubuntu Server LTS for x86-64 Containers) 2024.1 (Build 267_2U) Tue Apr 30 2024 16:04:37 EDT

@isc-tleavitt isc-tleavitt added bug Something isn't working customer Based on customer feedback (as opposed to something identified by developers) usability labels Oct 29, 2024
@isc-tleavitt isc-tleavitt added this to the Q3/Q4 2024 Targets milestone Oct 29, 2024
@isc-tleavitt isc-tleavitt added enhancement New feature or request bug Something isn't working and removed bug Something isn't working enhancement New feature or request labels Oct 29, 2024
@isc-tleavitt
Copy link
Collaborator

Calling this a bug since it's a consistency issue. Let's update the behavior to be:
In Basic Mode, creating a new branch via Git WebUI always uses the default merge branch as a basis, period.

Will file a separate enhancement request to allow selection of the branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working customer Based on customer feedback (as opposed to something identified by developers) usability
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants