Skip to content

Minor fixes #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 10, 2016
Merged

Minor fixes #644

merged 10 commits into from
Sep 10, 2016

Conversation

ronbak
Copy link
Contributor

@ronbak ronbak commented Sep 10, 2016

Hi,

this merge request fixes some minor issues.
It was created with help of Feram.

If it helped to improve this repository,
please consider to star Feram's repo to show some love! 😊

PS:
The Feram team is currently working on making this technology
available for everyone. If you want to be one of the first to use it,
please sign up up for the newsletter on feram.co.

@aciidgh aciidgh merged commit eed742c into swiftlang:master Sep 10, 2016
@ronbak
Copy link
Contributor Author

ronbak commented Sep 11, 2016

Thanks for merging!
I've just one question: How were you able to combine the whole merge request into one commit?
Did you do it manually or is it some new feature of GitHub I'm not aware of?
Thanks for your help!

@aciidgh
Copy link
Contributor

aciidgh commented Sep 11, 2016

It's a recent github feature where you can squash and merge commits from a PR.

Thanks for the contribution!

@ronbak
Copy link
Contributor Author

ronbak commented Sep 11, 2016

Mh OK. Good to know.
Sounds quite useful, but it seems also to be kind of incorrect, because actually ferambot is the author of every single commit and after the squash it looks like I was the author…

abertelrud added a commit that referenced this pull request Sep 16, 2016
…0-branch

* commit '3392287aace6beccd205a021c677abf7596526e6': (83 commits)
  Add a performance fixme to OutputByteStream
  [Xcodeproj] conditionally add default linker path
  Minor fixes (#644)
  [Documenation] Document build configurations
  [ModuleMapGenerator] Remove framework modulemap support
  [Xcodeproj] Create symlink'ed dylibs for C frameworks
  [Basic] Move Dictionary tuple initializer to Basic
  [Workspace] Use filesystem API for reading file
  Remove uses of private API (String._contiguousUTF8)
  Eliminate arithmetic overflows in Version.hashValue
  [DependencyResolver] Use `merging` for constraint container update.
  [Xcodeproj] Fix Plist to write in deterministic order.
  [DependencyResolver] Clean up constraint set subscripting of unassigned identifiers.
  [Xcodeproj] Add a Plist enum
  [PackageBuilder] Error on invalid manifest config
  [Documentation] Document the manifest file
  [Utility] Priortize pkgconfig env variable
  [Utility] Use FileSystem APIs to in PkgConfig
  Improve the error message that's shown when trying to access a package by a local path URL that doesn't refer to a repository.
  [PackageBuilder] Fix test target ref in manifest for external packages
  ...

# Conflicts:
#	Sources/Commands/SwiftTestTool.swift
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