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

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

    XMLWordPrintable

Details

    • Bug
    • Resolution: Done
    • Minor
    • None
    • 7.32.0.Final
    • AppFormer Foundation
    • None
    • 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 .
    • NEW
    • 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.

      Attachments

        Activity

          People

            gcaponet Guilherme Caponetto
            svenkata@redhat.com Srihari V
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: