• Home
    • View
    • Login
    This page
    • Normal
    • Export PDF
    • Page Information

    Loading...
  1. Dashboard
  2. Undefined Space
  3. Skara
  4. Backports

Page History

Versions Compared

Old Version 9

changes.mady.by.user Erik Helin

Saved on Oct 30, 2020

compared with

New Version 10

changes.mady.by.user Erik Helin

Saved on Oct 30, 2020

  • Previous Change: Difference between versions 8 and 9
  • Next Change: Difference between versions 10 and 11
  • View Page History

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

The /backport commit command can be used to quickly create a backport pull request for a given commit. Just navigate to the comment in source code hosting provider's web UI and add a comment consisting of "/backport <repo>". If the commit does not apply clean on the target repository then a message will be shown for the files with conflicts.

Workflow

Creating backports

Web UI

Navigate the to commit indented to be backported in the source code hosting provider's web UI and issue the /backport commit command. If the commit applied cleanly onto the target repository then go to the pull request linked in the reply and issue the /sponsor pull request command.

If the commit did not apply cleanly then the commit must be backport manually and backport pull request must be created manually. See the CLI section for an example of how to do this using the command-line.

CLI

Use the Skara CLI tool git-backport to try to automatically create a backport pull request for the given commit, for example git backport 5a526c1c5716f6d9a7fc94741bcdb2f424d342df. If the commit applied cleanly onto the target repository then sponsor the resulting backport pull request with git-pr sponsor, for example git pr sponsor 17.

Reviewing backports

Overview
Content Tools
ThemeBuilder

Terms of Use • License: GPLv2 • Privacy • Trademarks • Contact Us

Powered by a free Atlassian Confluence Open Source Project License granted to https://www.atlassian.com/software/views/opensource-community-additional-license-offer. Evaluate Confluence today.

  • Adaptavist ThemeBuilder Powered by Atlassian Confluence 7.4.1
  • Adaptavist ThemeBuilder printed.by.atlassian.confluence
  • Report a bug
  • Atlassian News
Atlassian
Adaptavist ThemeBuilder EngineAtlassian Confluence
{"serverDuration": 260, "requestCorrelationId": "c7d97fb420b17b81"}