nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

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

unknown

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

Capture.PNG

Accepted answers

Tim Crall1

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.

All comments

Tim Crall1

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.

unknown

Nice explanation. Thank you, Tim.

unknown

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

Tim Crall1

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