Skip to content

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

Closed
@raymond-rebbeck

Description

@raymond-rebbeck

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

Activity

added
bugSomething isn't working
customerBased on customer feedback (as opposed to something identified by developers)
on Oct 29, 2024
added
enhancementNew feature or request
bugSomething isn't working
and removed
bugSomething isn't working
enhancementNew feature or request
on Oct 29, 2024
isc-tleavitt

isc-tleavitt commented on Oct 29, 2024

@isc-tleavitt
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.

self-assigned this
on Oct 29, 2024
linked a pull request that will close this issueFix branch creation #595on Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

bugSomething isn't workingcustomerBased on customer feedback (as opposed to something identified by developers)usability

Type

No type

Projects

No projects

Relationships

None yet

    Development

    Participants

    @isc-tleavitt@isc-etamarch@raymond-rebbeck

    Issue actions

      Creating a new local branch in Git UI will not checkout the default merge branch prior · Issue #591 · intersystems/git-source-control