Relative Content

Tag Archive for gitprojectgit-merge

how to catch up with several release on develop branch from main on git?

In a project using git, We have been working on the `develop` branch, and the main branch is meant to just carry the stable versions. The way we work is when we have achieved a stable version on `develop`, we tag it with a release name, and (theoretically) merge it in the main. However this last step was forgotten many times and I end up with the following structure (develop is obviously simplified):

how to catch up with several release on develop branch from main on git?

In a project using git, We have been working on the `develop` branch, and the main branch is meant to just carry the stable versions. The way we work is when we have achieved a stable version on `develop`, we tag it with a release name, and (theoretically) merge it in the main. However this last step was forgotten many times and I end up with the following structure (develop is obviously simplified):