Uploaded image for project: 'AppFormer'
  1. AppFormer
  2. AF-2421

User is not notified about the consequences of "Squash and Merge" operation

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Minor
    • Resolution: Done
    • Affects Version/s: 7.32.0.Final
    • Fix Version/s: None
    • Component/s: AppFormer Foundation
    • Labels:
      None
    • Steps to Reproduce:
      Hide

      Steps:
      1.Login into Business Central with admin role.
      2.Create Space , Project and branch A.
      3.Add assets and create change request with branch A.
      4.Squash the changes with master branch.
      5.Again add assets or modify existing files with branch A .
      6.Try to create change request .

      -> AFter step 6 user not allowing to do squash or merge because squash operation rewrites git history.
      -> similarly After step 4 user not able to revert the squash commit .

      Show
      Steps: 1.Login into Business Central with admin role. 2.Create Space , Project and branch A. 3.Add assets and create change request with branch A. 4.Squash the changes with master branch. 5.Again add assets or modify existing files with branch A . 6.Try to create change request . -> AFter step 6 user not allowing to do squash or merge because squash operation rewrites git history. -> similarly After step 4 user not able to revert the squash commit .
    • Docs QE Status:
      NEW
    • QE Status:
      VERIFIED

      Description

      User is not notified about the consequences of "Squash and Merge" operation".
      Since squash operation rewrites git history
      i) reversion is not possible and
      ii) user not able to perform multiple squash or merge, getting a conflict with the target branch after a squashed changed request.
      there should be some notification or alert popup for the user.

        Gliffy Diagrams

          Attachments

            Activity

              People

              • Assignee:
                gcaponet Guilherme Caponetto
                Reporter:
                svenkata1 Srihari V
              • Votes:
                0 Vote for this issue
                Watchers:
                1 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: