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

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

Page History

Versions Compared

Old Version 16

changes.mady.by.user Ludvig Janiuk

Saved on Dec 03, 2021

compared with

New Version 17

changes.mady.by.user Erik Joelsson

Saved on Dec 22, 2021

  • Previous Change: Difference between versions 15 and 16
  • Next Change: Difference between versions 17 and 18
  • View Page History

Key

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

...

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 /sponsorintegrate 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.

...

Use the Skara CLI tool git-backport to try to automatically create a backport pull request for the given commit, for example git backport https://github.com/openjdk/jdk 5a526c1c5716f6d9a7fc94741bcdb2f424d342df. If the commit applied cleanly onto the target repository then sponsor integrate the resulting backport pull request with git-pr sponsorintegrate, for example git pr sponsor integrate 17.

If the commit could not be applied cleanly, then the conflicts must be manually resolved. After the conflicts have been resolved then a pull request must be created with the title "Backport <hash>". An example of how to do this is shown below:

...

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.13.8
  • Adaptavist ThemeBuilder printed.by.atlassian.confluence
  • Report a bug
  • Atlassian News
Atlassian
Adaptavist ThemeBuilder EngineAtlassian Confluence
{"serverDuration": 210, "requestCorrelationId": "e2f35fb4333225cf"}