merge into branch currently not active / checked out
From: Thomas Glanzmann <hidden>
Date: 2016-06-15 22:43:17
Hello,
is it possible to merge into a branch currently not active/checked out?
I have the following scenario:
- One branch per feature (cstatus, headers, mutt-collapse-flags, small-fixes)
- One upstream branch (master)
- One branch that has every feature branch (tg)
(faui00u) [~/work/mutt/mutt] git branch
cstatus
headers
master
mutt-collapse-flags
small-fixes
* tg
I want to merge master in every of the feature branches. Is that possible or
just bullshit because I don't have a working tree to handle conflicts?
Thomas