Skip to content

Fix code merge issue#2508

Merged
DonJayamanne merged 14 commits into
microsoft:masterfrom
DonJayamanne:FixMerge
Sep 6, 2018
Merged

Fix code merge issue#2508
DonJayamanne merged 14 commits into
microsoft:masterfrom
DonJayamanne:FixMerge

Conversation

@DonJayamanne

Copy link
Copy Markdown

No description provided.

@d3r3kk d3r3kk left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems ok. What's the issue? Can I help?

Comment thread src/test/index.ts Outdated
// We do this to ensure we only run debugger test, as debugger tests are very flaky on CI.
// So the solution is to run them separately and first on CI.
const grep = IS_CI_SERVER && IS_CI_SERVER_TEST_DEBUGGER ? 'Debug' : undefined;
const grep = IS_CI_SERVER && IS_CI_SERVER_TEST_DEBUGGER ? 'Debug' : 'Import Sort Provider';

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want this to be here? Or is this a WIP thing...?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WIP

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops

@DonJayamanne DonJayamanne changed the title Fix code merge issue WIP - Fix code merge issue Sep 6, 2018
@DonJayamanne

Copy link
Copy Markdown
Author

Seems ok. What's the issue? Can I help?

Tests passed in the PR.
Now tests failing on CI, due to:

  • Merge issue (resolved)
  • Test failure (no idea why its failing on CI but ok locally)

@DonJayamanne DonJayamanne changed the title WIP - Fix code merge issue Fix code merge issue Sep 6, 2018
@DonJayamanne DonJayamanne merged commit 814019f into microsoft:master Sep 6, 2018
@DonJayamanne DonJayamanne deleted the FixMerge branch October 2, 2018 22:46
@lock lock Bot locked as resolved and limited conversation to collaborators Jul 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants