Return to Answer

Rule of thumb: Use as few branches as possible, and as many branches as necessary.

If a branch is necessary or not is something you mostly learn from experience, but when in doubt: don't branch. The reason for this is branching hell.

You need branches when you need to modify the same code at the same time in 2 different ways, for example when you release the software and want to support the release with bugfixes while also working on the next major version, or when you start writing a feature which you know you might not complete before the next release (or the next testing phase).

Temporary branches that live for minutes or days are a different animal, you can create as many of them as you want to, because you're closing them as quickly as you open them.

PS: That means your current setup is good.

Rule of thumb: Use as few branches as possible, and as many branches as necessary.

If a branch is necessary or not is something you mostly learn from experience, but when in doubt: don't branch. The reason for this is branching hell.

You need branches when you need to modify the same code at the same time in 2 different ways, for example when you release the software and want to support the release with bugfixes while also working on the next major version, or when you start writing a feature which you know you might not complete before the next release (or the next testing phase).

Temporary branches that live for minutes or days are a different animal, you can create as many of them as you want to, because you're closing them as quickly as you open them.

PS: That means your current setup is good.

Rule of thumb: Use as few branches as possible, and as many branches as necessary.

If a branch is necessary or not is something you mostly learn from experience, but when in doubt: don't branch. The reason for this is branching hell.

You need branches when you need to modify the same code at the same time in 2 different ways, for example when you release the software and want to support the release with bugfixes while also working on the next major version, or when you start writing a feature which you know you might not complete before the next release (or the next testing phase).

Temporary branches that live for minutes or days are a different animal, you can create as many of them as you want to, because you're closing them as quickly as you open them.

Rule of thumb: Use as few branches as possible, and as many branches as necessary.

If a branch is necessary or not is something you mostly learn from experience, but when in doubt: don't branch. The reason for this is branching hell.

You need branches when you need to modify the same code at the same time in 2 different ways, for example when you release the software and want to support the release with bugfixes while also working on the next major version, or when you start writing a feature which you know you might not complete before the next release (or the next testing phase).

Temporary branches that live for minutes or days are a different animal, you can create as many of them as you want to, because you're closing them as quickly as you open them.

PS: That means your current setup is good.

Rule of thumb: Use as few branches as possible, and as many branches as necessary.

If a branch is necessary or not is something you mostly learn from experience, but when in doubt: don't branch. You need branches when you need to modify the same code at the same time in 2 different ways.

Rule of thumb: Use as few branches as possible, and as many branches as necessary.

If a branch is necessary or not is something you mostly learn from experience, but when in doubt: don't branch. The reason for this is branching hell.

You need branches when you need to modify the same code at the same time in 2 different ways, for example when you release the software and want to support the release with bugfixes while also working on the next major version, or when you start writing a feature which you know you might not complete before the next release (or the next testing phase).

Temporary branches that live for minutes or days are a different animal, you can create as many of them as you want to, because you're closing them as quickly as you open them.