Skip to main content

Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

    •  
      request #38640 Pull request overview should inform about potential merge conflicts
    Actions
    Infos
    #38640
    Manuel Vacelet (vaceletm)
    2024-08-30 15:13
    2024-06-26 11:15
    40263
    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
    Artifact links

    Releases

    Fixed in

    Artifact ID Project Tracker Summary Status Last Update Date Submitted By Assigned to
    rel #37897 Tuleap Releases 15.13 Delivered 2024-09-12 17:12 Manuel Vacelet (vaceletm)
    By Quentin Dehais (qdehais)
    (171 kB)
    Intégrateur Error normal state.png
    References
    Referencing request #38640

    Git commit

    tuleap/tuleap/stable

    feat: Show merge warnings and errors to everyone 45b3e7be2f
    User avatar Joris MASSON (jmasson) , 2024-08-29 15:48
    Display settings

    Follow-ups

    User avatar
    Quentin Dehais (qdehais)2024-06-26 11:29
    • 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