Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Merge multiple times the same branch into another

Tags:

git

Im using GIT. Let's say I have the branch development and production. I made some changes on development and merged to production. Everything worked as expected. Then I continue modifying development, and when I want to merge again with production, git says "Already up-to-date."... so how's the way to marge multiple times the same branch into another?

like image 311
David TG Avatar asked Mar 02 '17 15:03

David TG


2 Answers

I guess you tried merging production to development and production did not evolve further, or at least you didn't fetch the changes. Merging a branch multiple times into another works fine if there were changes to merge.

like image 185
Vampire Avatar answered Sep 28 '22 08:09

Vampire


Actually yes you totally can, when you merge again it will bring over any commits that don't exist on production.

https://git-scm.com/docs/git-merge

like image 34
Mr Chow Avatar answered Sep 28 '22 08:09

Mr Chow