Skip to content
Commit bb02689d authored by Josef Weidendorfer's avatar Josef Weidendorfer
Browse files

Take over the state of frameworks branch into master

We cannot just reset master to point to the frameworks
branch, as then "git push" is prohibited by the server
due to the new master not being a descendant of old master.
To make this work, do a fake merge instead.

Done by:
  git checkout frameworks
  git merge -s ours master

And afterwards make master point to frameworks:
  git checkout master
  git reset --hard frameworks
parents 699bf367 3c9da249
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment