merge into branch currently not active / checked out

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

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

Re: merge into branch currently not active / checked out

From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:17

Thomas Glanzmann, Sun, Jun 17, 2007 09:22:25 +0200:
Hello,
is it possible to merge into a branch currently not active/checked out?
not in current implementation of merge algorithms and conflict
handling.
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?
You are _very_ welcome to improve this :) It's not very often need, so
people just do without it (i.e. clone the repo, do a merge there and
pull back).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help