0

We have a bare providing the branches "trunk", "release1", "release2" etc. I have cloned me a local repository and all my changes were pushed to "trunk". Now I want to "merge" selected commits also to "releaseX". I do not see how to do this.

I tried to reproduce this locally. I created me a local repository "REPO" and worked on it and committed that. Then I created me (locally) a bare named "BARE" and defined the "BARE" as origin to the config (git remote add origin ../BARE) and then pushed all my changes. Then I created me another branch on the "BARE" by git branch RELEASE. Next I worked on REPO and committed this and pushed to "BARE/master".

And here I am: The BARE/master and the BARE/RELEASE are different and I would like to merge master to RELEASE.

Hope this explains my question.

joanis
  • 10,635
  • 14
  • 30
  • 40
Ulrich
  • 715
  • 2
  • 7
  • 25
  • 2
    You cannot [merge in a bare repo](https://stackoverflow.com/a/18501139/7976758), you must [merge in non-bare](https://stackoverflow.com/a/40321630/7976758) and push to bare. – phd Feb 20 '19 at 16:12
  • Is there some reason why you have to do this with a bare repository? – John Szakmeister Feb 20 '19 at 20:48

1 Answers1

0

Git it now. Did CherryPicking and pushed this to the BARE.

Ulrich
  • 715
  • 2
  • 7
  • 25