Update for insiders. by sean-mcmanus · Pull Request #2264 · microsoft/vscode-cpptools · GitHub
Skip to content

Update for insiders.#2264

Merged
sean-mcmanus merged 3 commits into
insidersfrom
seanmcm/0_17_7_insiders
Jul 12, 2018
Merged

Update for insiders.#2264
sean-mcmanus merged 3 commits into
insidersfrom
seanmcm/0_17_7_insiders

Conversation

@sean-mcmanus

Copy link
Copy Markdown
Contributor

No description provided.

Comment thread Extension/CHANGELOG.md Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

don't change the changelog. it's a source of merge conflicts later.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Okay.

Comment thread Extension/package-lock.json Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this is strange. I wonder why this was not updated by the merge from master.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think master is incorrect.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

no, master is correct. this is wrong. I'll see if I can fix it

@sean-mcmanus sean-mcmanus merged commit 6dc1494 into insiders Jul 12, 2018
@bobbrow bobbrow deleted the seanmcm/0_17_7_insiders branch August 16, 2018 16:23
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 13, 2020
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