Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • U uw_wcms_tools
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Activity
  • Graph
  • Commits
Collapse sidebar
  • WCMSWCMS
  • uw_wcms_tools
  • Merge requests
  • !12

ISTWCMS-4802: Do merges with repository clones instead of merge requests

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Liam Morland requested to merge feature/ISTWCMS-4802-lkmorlan-remove-merge-requests into 7.x-1.x Jun 15, 2021
  • Overview 1
  • Commits 2
  • Pipelines 0
  • Changes 1

Merge requests will not merge for the third and subsequent tags because the release branch is behind. GitLab requires a rebase which does not work with our branching model. Instead, do the merge in a repository clone.

The clones will be kept to avoid the need to clone each time. The user running the script must have read-write access to UW_WCMS_TOOLS_REPOSITORY_DIRECTORY and ssh keys configured to allow the push.

Edited Jun 16, 2021 by Chris Shantz
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: feature/ISTWCMS-4802-lkmorlan-remove-merge-requests