common-flow

common-flow copied to clipboard

common-flow should accommodate for situations where it is necessary to use main. I do not want to discuss whether one should use main or master as a branch name.

frederik-b

For short-term branches I don't care much -- seeing them helps you remember to make sure they're closed, but for long-term release branches.... Many GUI tools (specifically including **azure git**...

Jaykul

There is a sort-of footnote in the git best practices section: > vi. It is RECOMMENDED that all branches be merged using "git merge --no-ff". This makes sure the reference...

Jaykul

ccouzens

Release version numbers getting reused in Long-Term Release Branches

3

I'm evaluating branching models for my company as we transition to a git workflow, and really like this proposal. However, my reading of it implies that release tags get reused...

bcparkison

Extract required decisions into questionaire (optionally automatic templating)

1

I want to stress this is low priority and for after 1.0 release. Many points require a decision for a specific strategy inhouse. For example, either have a VERSION file...

mriegler

Add FAQ entry about the advantages of using rebase over merge for pulling in changes from the source branch.

1

jimeh

(not because it's hard, but because I had to go look it up)

andywis

jimeh