Enhancement #27965
Updated by Pauline IOGNA 4 months ago
The qa bot sometimes cannot merge and gives this message: <pre> This PR is not mergeable to upper versions. Since it is "Ready for merge" you must merge it by yourself using the following command: rudder-dev merge https://github.com/Normation/rudder/pull/6755 -- Your faithful QA Kant merge: "It is beyond a doubt that all our knowledge begins with experience." (https://ci.normation.com/jenkins/job/merge-accepted-pr/110609/console) </pre> But it doesn't mention additional step to do in case of conflict. After resolving conflict when rudder-dev merge, git says to execute a git commit to conclude. But then it is necessary to run rudder-dev merge all to up-merge on the other branches. So the text to add is : <pre> See https://github.com/Normation/rudder-tools/blob/6343eac133fd03c319fbd45ed3d7a04a04dbdd09/scripts/rudder-dev/quality-assistant#L249 If necessary please resolve conflicts. Then check the state of higher version branches and run rudder-dev merge all if needed. </pre> See https://github.com/Normation/rudder-tools/blob/6343eac133fd03c319fbd45ed3d7a04a04dbdd09/scripts/rudder-dev/quality-assistant#L249