Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Need help to manage Multiple Release Branches [required Partial Merge for Continous Integration]

Hi there,

I have a very different requirement managing multiple release branches (unlike Git-Flow or using Master as only release branch). As i'm not a CLI expert so want to learn how can i achieve my requirements using Source Tree.

I'm quite sure that you guys will help me overcome these issues, thanks :)

 

 

Here is a very simple explanation of my problem.

[1]- ill have a baseBranch with a paid code from third party.

[2]- ill have another child branch of baseBranch which will have custom version (custom code edits etc) of that paid code and we name it "customCode".

[3]- ill have another child branch of "customCode" and will name it "customDesign" so paid code now have custom design changes.

[4]- Now i'll will have multiple branches of "customDesign" for different clients and each branch will b a release branch for that client .

 

Now this branch system will work as "OOP" where a superclass cant have a subclass functionality, but sub class may have super class functionality or override it.

 

Having said that:

- Merging will never work from bottom to top, [4].'s changes will never go into [3] [2] [1]. 

- Merging may work from top to bottom. For example, if i update paid code from third party in [1]. then ill b able to merge it back to [2] BUT keep my custom changes intact (Partial Merging).

- Same above rule apply from [3] to [4].

 

Please advise how can i do that using Source Tree.

 

Thanks again :)

 

 

 

 

 

 

 

 

 

 

0 comments

Comment

Log in or Sign up to comment
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,695 views 4 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you