Skip to content

[Test only] Apply changes from VF# Jenkins build activation - #829

Closed
forki wants to merge 4 commits into
fsharp:masterfrom
forki:jenkins
Closed

[Test only] Apply changes from VF# Jenkins build activation#829
forki wants to merge 4 commits into
fsharp:masterfrom
forki:jenkins

Conversation

@forki

@forkiforki commented Oct 24, 2017

Copy link
Copy Markdown
Member

@forki
forkiforce-pushed the jenkins branch 2 times, most recently from 8882216 to 5d3249aCompareOctober 24, 2017 07:08
@forkiforki closed this Oct 24, 2017
@forkiforki reopened this Oct 24, 2017
@dsyme

Copy link
Copy Markdown
Contributor

@forki These should be applied by a integration/merge from Microsoft/visualfsharp master --> fsharp/FSharp.Compiler.Service master, rather than a separate commit

I'll close - can you do the integration PR instead? You may need to git rm and git add on changed files that are in visualfsharp but not in FCS, e.g.

git rm -fr vsintegration
git rm -fr setup
git rm -fr src\fsharp\FSharp.Compiler

and a bunch of other stuff - the conflict list should only contain such stuff

After integration the two repos should be more or less equal content-wise

@dsymedsyme closed this Oct 25, 2017
@forki

Copy link
Copy Markdown
MemberAuthor

Sorry I wasn't clear here. This wasn't meant to be merged. I wanted to cross check if my changes in VF# still work here. And for unknown reasons Travis failed during restore. Can you please reopen?

@dsymedsyme reopened this Oct 25, 2017
@dsyme

Copy link
Copy Markdown
Contributor

@forki OK, thanks

@dsymedsyme changed the title Apply changes from VF# Jenkins build activation[Test only] Apply changes from VF# Jenkins build activationOct 25, 2017
@dsyme

dsyme commented Nov 3, 2017

Copy link
Copy Markdown
Contributor

Closing as will be covered by integration

@dsymedsyme closed this Nov 3, 2017
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@forki@dsyme