3 added 337 characters in body
source | link

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.

The 1|0 means that this branch is 1 behind the master branch, 5|0 means 5 commits behind the master branch and 2|3 means two behind master branch and 3 ahead.

Branching strategy

  1. The develop is branched from the master, i.e. 0|0
  2. A feature branch is created from the develop
  3. When the feature is ready the code from the feature branch will be merged into the develop
  4. A release branch is created from the develop branch
  5. The release branch will be merged into master

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.

The 1|0 means that this branch is 1 behind the master branch, 5|0 means 5 commits behind the master branch and 2|3 means two behind master branch and 3 ahead.

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.

The 1|0 means that this branch is 1 behind the master branch, 5|0 means 5 commits behind the master branch and 2|3 means two behind master branch and 3 ahead.

Branching strategy

  1. The develop is branched from the master, i.e. 0|0
  2. A feature branch is created from the develop
  3. When the feature is ready the code from the feature branch will be merged into the develop
  4. A release branch is created from the develop branch
  5. The release branch will be merged into master
2 added 170 characters in body
source | link

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.

The 1|0 means that this branch is 1 behind the master branch, 5|0 means 5 commits behind the master branch and 2|3 means two behind master branch and 3 ahead.

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.

The 1|0 means that this branch is 1 behind the master branch, 5|0 means 5 commits behind the master branch and 2|3 means two behind master branch and 3 ahead.

1
source | link

What are best practices to synchronize multiple git branches?

For example, Gitlab indicates that the develop branch is behind master:

Example 1

enter image description here

Example 2

enter image description here

One could make a merge request from master to develop, but as there are no code changes it seems impossible to align these branches.

The current approach is to remove the develop branch once in a while and to create it again in order to get 0 | 0 again.