[gmx-developers] Merge enforced rotation branch into master

[Teemu Murtola]

On Tue, Nov 16, 2010 at 17:58, Carsten Kutzner <ckutzne at gwdg.de> wrote:
> can I do a
> git checkout master; git merge release-4-5-patches; git push
> such that the master gets all the pending fixes from the
> 4.5 branch?

It depends a bit on the context whether that works.  Assuming that you
have all the tracking branches created, what should work in all
situations is the following sequence:
  git checkout release-4-5-patches
  git pull
  git checkout master
  git pull
  git merge release-4-5-patches
  git push
Or alternatively, assuming that your remote repository has the default name,
  git checkout master
  git pull
  git merge origin/release-4-5-patches
  git push
which gives identical history, but a bit different commit message on
the merge (that can also be edited manually).

Teemu