Project

General

Profile

Actions

Bug #12128

closed

Rudder branch 4.1 contains code from 4.2

Added by Nicolas CHARLES about 6 years ago. Updated about 6 years ago.

Status:
Rejected
Priority:
N/A
Assignee:
-
Category:
-
Target version:
Severity:
UX impact:
User visibility:
Effort required:
Priority:
0
Name check:
Fix check:
Regression:

Description

Rudder 4.1 contains code from 4.2, so it breaks many things

This happened because we didn't had luck (and not atomicity), and our "quality assistant" tried to merge something when at the same time trigger updated the underlying repository, so assistant merged/push not what it was suppose to.

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

Also available in: Atom PDF