Your platform will be unavailable on the 13th of November 2024 from 9am to 12pm (Paris time) for maintenance operations

    •  
      request #38640 Pull request overview should inform about potential merge conflicts
    Infos
    #38640
    Manuel Vacelet (vaceletm)
    2024-08-30 15:13
    2024-06-26 11:15
    40261
    Details
    Pull request overview should inform about potential merge conflicts

    Information about merge conflicts should be given to everybody that can read the pull request (at the moment, it's only visible to integrators). Moreover, after PR overview re-design, the information is less visible as integrators have to click on Merge to get the information about the conflicts. This should be visible directly in the PR overview as shown in the screenshot below :

    2703-Inte%CC%81grateur%20Error%20normal%20state.png

    Here is the updated PR overview Mockups : https://www.figma.com/design/hDQWSuKJOVIve2B1mPudJE/Fix-Pull-Request---CEA?node-id=0-1&t=tWiaxNuc2Amj2U6T-1

    Pull Request
    Empty
    Empty
    • [ ] enhancement
    • [ ] internal improvement
    Empty
    Stage
    Joris MASSON (jmasson)
    Closed
    2024-08-30
    Attachments
    References
    Referencing request #38640

    Follow-ups

    User avatar
    • Original Submission
      Something went wrong, the follow up content couldn't be loaded
      Only formatting have been changed, you should switch to markup to see the changes