Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • S sucs-site
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 25
    • Issues 25
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • sucssite
  • sucs-site
  • Issues
  • #42

Closed
Open
Created Dec 04, 2019 by Thomas Lake@tswsl1989🔧Developer

CI/CD & Merges: Enable fast forward merges

Currently the correct process for a simple change is:

  • Commit to master
  • Merge to beta
  • Merge from beta to sucs-site

☑ Generally good practice

☑ Bigger changes can be reviewed in beta easily

🚫 Simple changes generate multiple merge commits

Is there any particular downside to enabling fast-forward merges through Gitlab? The only one I can think of (and haven't checked) is that it might require a one-off rebase of beta and sucs-site to tidy up the current history before it would be useful.

Edited Dec 04, 2019 by Thomas Lake
Assignee
Assign to
Time tracking