Project

General

Profile

Actions
Copy link

Enhancement #27965

open

Complete github qa bot message when pull request is not mergeable

Enhancement #27965: Complete github qa bot message when pull request is not mergeable

Added by Pauline IOGNA 7 months ago. Updated 29 days ago.

Status:
Pending release
Priority:
5 (lowest)
Assignee:
Pauline IOGNA
Category:
-
Target version:
master
Pull Request:
https://github.com/Normation/rudder-t...
UX impact:
Suggestion strength:
User visibility:
Effort required:
Name check:
To do
Fix check:
To do
Regression:
No

Description

The qa bot sometimes cannot merge and gives this message:

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)

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 : 


If necessary please resolve conflicts. Then check the state of higher version branches and run rudder-dev merge all if needed.

See https://github.com/Normation/rudder-tools/blob/6343eac133fd03c319fbd45ed3d7a04a04dbdd09/scripts/rudder-dev/quality-assistant#L249

Updated by Vincent MEMBRÉ 6 months ago Actions
Copy link
 #1

  • Target version changed from 9.1.0~alpha1 to 9.1.0~beta1

Updated by Vincent MEMBRÉ 4 months ago Actions
Copy link
 #2

  • Target version changed from 9.1.0~beta1 to 9.1.0~rc1

Updated by Vincent MEMBRÉ 3 months ago Actions
Copy link
 #3

  • Target version changed from 9.1.0~rc1 to 9.1.0

Updated by Vincent MEMBRÉ 3 months ago Actions
Copy link
 #4

  • Target version changed from 9.1.0 to 9.1.1

Updated by Vincent MEMBRÉ 2 months ago Actions
Copy link
 #5

  • Target version changed from 9.1.1 to 9.1.2

Updated by Pauline IOGNA about 1 month ago Actions
Copy link
 #6

  • Project changed from Rudder to Rudder tools
  • Category deleted (Architecture - Code maintenance)
  • Target version deleted (9.1.2)

Updated by Pauline IOGNA about 1 month ago Actions
Copy link
 #7

  • Description updated (diff)

Updated by Pauline IOGNA 30 days ago Actions
Copy link
 #8

  • Target version set to master

Updated by Pauline IOGNA 30 days ago Actions
Copy link
 #9

  • Status changed from New to In progress

Updated by Pauline IOGNA 30 days ago Actions
Copy link
 #10

  • Description updated (diff)

Updated by Pauline IOGNA 30 days ago Actions
Copy link
 #11

  • Status changed from In progress to Pending technical review
  • Pull Request set to https://github.com/Normation/rudder-tools/pull/869

Updated by Pauline IOGNA 29 days ago Actions
Copy link
 #12

  • Status changed from Pending technical review to Pending release
Actions
Copy link

Also available in: PDF Atom