Skip to main content
Closed

Select reciprocal merge as default for DEVELOP->RELEASE and RELEASE->MAIN

Related products:Software Factory

Dave Bieleveld Starcode
Vanguard

Protected branches

Since the branches RELEASE and DEVELOP are automatically protected and recognized as persistent and protected it would be nice that when the popup for “Create merge session” has the reciprocal merge as the default option (while still being able to chose to archive the branch). RELEASE and DEVELOP won’t be likely to be archived afterwards.
It’ll prevent that you accidentally archive such a branch and it save a few clicks.

 

Did this topic help you find an answer to your question?

6 replies

Mark Jongeling
Administrator
Forum|alt.badge.img+23

When both branches are protected, reciprocal merging is the only option.

When the source branch is unprotected, the default behavior is to archive the branch as it is a branch that does not have an indefinite lifespan. Unprotected branches are mostly Feature branches, Hotfix branches, or Test branches that will be discarded later. The happy flow is to merge the feature into the protected branch and thereafter archive the feature branch.


Dave Bieleveld Starcode
Vanguard
Forum|alt.badge.img+2

So, why is  branch DEVELOP not automatically protected, as stated in here?

 


Jeroen van den Belt
Administrator
Forum|alt.badge.img+9

​Hi @Dave Bieleveld Starcode,

As mentioned in this release note, during the upgrade to 2024.1 we automatically marked branches named MAINRELEASE, and DEVELOP as protected, based on their name. At the moment I cannot say why this was not done for your DEVELOP branch, unless it was created after the upgrade to the 2024.1.

Although we could figure this out (which would require a ticket with reproduction in the form of a database backup before the 2024.1 upgrade), I think it would be more effective in this situation if you activate the checkbox yourself in this case.

In your opinion, did our responses cover all parts of your idea?


Jeroen van den Belt
Administrator
Forum|alt.badge.img+9
NewNeeds feedback

Dave Bieleveld Starcode
Vanguard
Forum|alt.badge.img+2

@Jeroen van den Belt I agree. You can cancel this idea/request.


Jeroen van den Belt
Administrator
Forum|alt.badge.img+9
Needs feedbackClosed

Reply


Cookie policy

We use cookies to enhance and personalize your experience. If you accept you agree to our full cookie policy. Learn more about our cookies.

 
Cookie settings