Home > Enterprise >  Git Flow merging a release branch back to Development
Git Flow merging a release branch back to Development

Time:10-28

I have a feature branch (let's call it A) that I've merged with my Development branch from which I've created a release-A branch which has no changes. I merged release-A to master and have tagged master with a release identifier. Git Flow says that release-A should be merged back to Development but I'm reasonably assuming this is only needed if there are differences between release A and Development?

I'm supposing that if a branch from Development is taken and then merged back, then Git will realise that there are no differences and effectively ignore the merge?

I'm pretty new to Git so please excuse if this is a dumb question.

CodePudding user response:

since release-A and Development branches point both to the same commit, merging will not change anything. So yes, git realizes that there is nothing to do.

EDIT for "simple" questions like this, you can always create a dummy git repository and see what happens. In this case:

mkdir test
cd test
git init
echo a > a
git add a
git commit -m "add a"
git branch release-A
git merge release-A

this gives:

Already up to date.

  • Related