Is there a way to force labels to the same level?

Hi,

I get the feeling this question might be a bit dumb, but I'm new to the whole Git thing and struggling to see if I can do what I want (or even if it makes any sense).

I have this in SourceTree:

Capture.PNG

I am using the GitFlow methodology and menu commands, which means I always have a develop and a master branch.  When I reach a mini-milestone, can I force the develop and master labels to synchronise with each other?

Any advice very much appreciated.

 

Kind wishes ~ Patrick

 

1 answer

1 accepted

Normally in GitFlow, you would do this by merging the release branch into the master branch and the development branch both at the same time.

This will sync them up unless a new feature branch has been merged into develop since the release branch was forked off it.  If that's the case, then you wouldn't want them really synced, but merging from release back into develop will still ensure  that any last minute changes made in the release branch get incorporated into develop.

Nice explanation.  Thank you, Tim.

Sorry, just realised I don't fully understand this, Tim.  I use the GitFlow menu, so, when I finish a release the Finish Release function merges into master and into develop, but I still don't end up with the two on the same level in SourceTree.

  • Patrick

 

 

I'm not specifically familiar with the GitFlow menu itself, but what do you mean by "on the same level"?

If you look at my screen snippet above, you can see that origin/develop is on the line beneath origin/master, and also develop is below master. When you first initialise the GitFlow process, all these labels appear on the same row in SourceTree. If you can't follow my explanation, I will go through the process of creating a new project and grab a screen snippet of what I mean. (Sorry I couldn't reply sooner. My profile score limits my posting frequency.) - Patrick

To do that, you would have to merge develop into master, which is not really standard process in GitFlow. I'm not sure there would any benefit to it, either, other than making the picture look the way you seem to want it to.

Thanks Tim. To be honest, I did suspect I was just being OCD about it. I was just curious why, once you start with GitFlow, it never again looks the way it did when you started. That said, I do understand it fine the way it is, and I take your point that to merge develop into master doesn't get you anything.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

274 views 0 3
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot