Skip to content

Conversation

@KevinRansom
Copy link
Contributor

oh idiot I squashed should have merged.

* don't update project info if the source file collection is empty (#3792)

* install templates VSIX to a unique directory (#3804)

* P2p references (#3777)

* P2p references

* Fix test

* test fix

* go faster stripes

* new project works better

* Re-add debug assert for sourcefiles

* Parameterise rc location (#3744)

* Fix issues
* Put nupkgs into artifacts (#3806)

* Make FCS build work on Jenkins (#3788)
@Pilchie
Copy link
Member

Pilchie commented Oct 26, 2017

I disagree that you should squash branch to branch merges strongly.

It prevents commands like git branch --contains --all SHA from saying what branches a given commit made it into.

@KevinRansom KevinRansom merged commit 3a4bd07 into master Oct 27, 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.

4 participants