Uploaded image for project: 'Data Management'
  1. Data Management
  2. DM-1631

Prevent fast-forward merges to master

    Details

    • Team:
      SQuaRE

      Description

      Please implement a git hook to only allow pushes to master if they are:
      1) non-fast-forward merge commits or
      2) documentation fix commits with "#master-doc-fix" in the commit message.

      This will prevent accidental fast-forward merges from confusing the master history.

        Attachments

          Issue Links

            Activity

            Hide
            tjenness Tim Jenness added a comment -

            We discussed this issue at CCB and decided to close it as WONT FIX. GitHub does not allow us to install hooks and does not therefore prevent a fast forward merge from happening if the tip of master has been checked and passes travis tests on the pull request. We have configured our repositories to support merging of pull requests on GitHub and this should reduce the chances of a fast forward being pushed.

            Show
            tjenness Tim Jenness added a comment - We discussed this issue at CCB and decided to close it as WONT FIX. GitHub does not allow us to install hooks and does not therefore prevent a fast forward merge from happening if the tip of master has been checked and passes travis tests on the pull request. We have configured our repositories to support merging of pull requests on GitHub and this should reduce the chances of a fast forward being pushed.

              People

              • Assignee:
                frossie Frossie Economou
                Reporter:
                ktl Kian-Tat Lim
                Watchers:
                John Swinbank, Kian-Tat Lim, Tim Jenness
              • Votes:
                0 Vote for this issue
                Watchers:
                3 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Summary Panel