Actions
Bug #12133
closed4.3 branch got merged in 4.1
Pull Request:
Severity:
UX impact:
User visibility:
Effort required:
Priority:
0
Name check:
Fix check:
Regression:
Description
The 4.3 got erroneously merged into 4.1 by our merging scripts.
It is the same problem than in #12128, but for the repository "https://github.com/Normation/rudder-packages/".
We resetted the branched to the previous correct state as it is not possible to cleanly revert a git merge commit without git becoming mad.
This break the world, so if you are using that repository, you will need to do exactly:
- either delete repos, clone it back
- or reset each working branch to the new state:
git fetch git checkout branches/rudder/4.1 git reset --hard origin/branches/rudder/4.1 git checkout branches/rudder/4.2 git reset --hard origin/branches/rudder/4.2 git checkout branches/rudder/4.3 git reset --hard origin/branches/rudder/4.3 git checkout master git reset --hard origin/master
- or delete your existing branches (4.1, 4.2, 4.3 and master) checkout them anew.
Actions