This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Move default development back to master #13

Closed

khmarbaise opened this issue Dec 12, 2018 · 1 comment

Labels

task

Milestone

Member

khmarbaise commented Dec 12, 2018

No description provided.

khmarbaise added this to the 1.8.0 milestone

khmarbaise added the task label

khmarbaise changed the title ~~Move to default development on master~~ Move default development back to master

khmarbaise closed this as completed in

dc298b5

Member Author

khmarbaise commented Jan 27, 2019

Solved via the following:

$ git checkout plexus-containers-1.x
$ git merge -m 'merge message' -s ours origin/master
$ git checkout master
$ git merge plexus-containers-1.x
$ git push origin plexus-containers-1.x

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.