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

    Loading...
  1. Dashboard
  2. Undefined Space
  3. Build
  4. Submission Forests

Page History

Versions Compared

Old Version 40

changes.mady.by.user Brian Beck

Saved on Dec 05, 2016

compared with

New Version 41

changes.mady.by.user Brian Beck

Saved on Dec 05, 2016

  • Previous Change: Difference between versions 39 and 40
  • Next Change: Difference between versions 41 and 42
  • View Page History

Key

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

...

How is my branch merged with the upstream forest?

When a change to branch B is pushed to the submission forest, the difference between the head of B and the latest common ancestor of B and the default branch is computed as a single patch.  This patch is then applied to the default branch in a child of the upstream forest.  The commit message for the patch is taken from the commit message at the head of branch B.  If the patch applies cleanly without jcheck errors and without needing manual merging, the child of the upstream forest is built & tested.  If all builds and tests succeed, the child of the upstream forest is pushed into the upstream forest and the job is complete.

Should I close my branch?

...

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.

  • Kolekti ThemeBuilder Powered by Atlassian Confluence 8.5.21
  • Kolekti ThemeBuilder printed.by.atlassian.confluence
  • Report a bug
  • Atlassian News
Atlassian
Kolekti ThemeBuilder EngineAtlassian Confluence
{"serverDuration": 494, "requestCorrelationId": "cc5f29bb5a7576c0"}