Skip to content

Conversation

@forki
Copy link
Member

@forki forki commented Oct 24, 2017

details at dotnet/fsharp#3788

@forki forki force-pushed the jenkins branch 2 times, most recently from 8882216 to 5d3249a Compare October 24, 2017 07:08
@forki forki closed this Oct 24, 2017
@forki forki reopened this Oct 24, 2017
@dsyme
Copy link
Contributor

dsyme commented Oct 25, 2017

@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

@dsyme dsyme closed this Oct 25, 2017
@forki
Copy link
Member Author

forki commented Oct 25, 2017

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?

@dsyme dsyme reopened this Oct 25, 2017
@dsyme
Copy link
Contributor

dsyme commented Oct 25, 2017

@forki OK, thanks

@dsyme dsyme changed the title Apply changes from VF# Jenkins build activation [Test only] Apply changes from VF# Jenkins build activation Oct 25, 2017
@dsyme
Copy link
Contributor

dsyme commented Nov 3, 2017

Closing as will be covered by integration

@dsyme dsyme closed this Nov 3, 2017
Sign up for free to 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