Skip to content

Conversation

@0xc0170
Copy link
Contributor

@0xc0170 0xc0170 commented Feb 7, 2020

Summary of changes

Conflict -> needs: work not CI

PR #12152 was a test case - I checked simulator. This fixes it, no CI if there is a conflict with base branch.

Impact of changes

Migration actions required

Documentation


Pull request type

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[X] No Tests required for this change (E.g docs only update)
[] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers


@0xc0170 0xc0170 force-pushed the fix_mergify_conflict branch from 1819c80 to 59746d7 Compare February 7, 2020 15:10
@ciarmcom
Copy link
Member

ciarmcom commented Feb 7, 2020

@0xc0170, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@ciarmcom ciarmcom requested a review from a team February 7, 2020 16:00
@0xc0170
Copy link
Contributor Author

0xc0170 commented Feb 11, 2020

CI started to progress

@adbridge Please review

@0xc0170 0xc0170 added release-version: 6.0.0-alpha-2 Second pre-release version of 6.0.0 and removed needs: review labels Feb 11, 2020
@0xc0170 0xc0170 merged commit 69a7d67 into ARMmbed:master Feb 11, 2020
@0xc0170 0xc0170 deleted the fix_mergify_conflict branch February 11, 2020 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-version: 6.0.0-alpha-2 Second pre-release version of 6.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants