Uploaded image for project: 'Nuxeo Studio'
  1. Nuxeo Studio
  2. NXS-5215

Prevent "Merge into my workspace" when there is some WIP

    XMLWordPrintable

    Details

    • Sprint:
      NOS 2019-03 02, NOS 11.1.6 - 2019-04 1, NOS 11.1.7 - 2019-04 2
    • Story Points:
      3

      Description

      If there is some uncommited changes (a.k.a. WIP commit) in the user workspace (a.k.a. wip branch), he shouldn't be able to merge antoher branch into it, as for a standard local git workspace

      Also we have to update the popup displayed when clicking the "Merge into my workspace" button to tell user that the merge will be pushed automatically if he's in simple or intermediate mode

        Attachments

          Activity

            People

            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Time Tracking

                Estimated:
                Original Estimate - Not Specified
                Not Specified
                Remaining:
                Remaining Estimate - 0 minutes
                0m
                Logged:
                Time Spent - 4 hours
                4h

                  PagerDuty

                  Error rendering 'com.pagerduty.jira-server-plugin:PagerDuty'. Please contact your Jira administrators.