Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • S sysadmin
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Issues 93
    • Issues 93
    • List
    • Boards
    • Service Desk
    • Milestones
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
  • Wiki
    • Wiki
  • Activity
  • Create a new issue
  • Issue Boards
Collapse sidebar
  • tails
  • sysadmin
  • Issues
  • #17817
Closed
Open
Created Mar 23, 2021 by anonym@anonymReporter

Keep Tails' devel branch synced with the stable branch

This is only about Tails' Git repo.

Whenever we merge something, like a bugfix, into stable, we are then supposed to merge stable into devel to keep them synced. I frequently forget this, but it seems like something that could be automated. The only case I expect this to not be straightforward for is when there are merge conflicts. In that case, I suppose whoever pushed to stable triggering the merge should be notified about the conflict, and that it has to be resolved manually.

Is this possible?

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking