Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Update from upstream #107

Merged
merged 10 commits into from
Oct 6, 2016
Merged

Conversation

larsbergstrom
Copy link

@larsbergstrom larsbergstrom commented Oct 6, 2016

r? @metajack @emilio

Do we normal do these updates as a git merge tomaka/glutin and then open the PR with a merge commit? Or do we rebase our branch on top of it and then do a yolo-force-push onto the servo branch? /me is confused...


This change is Reviewable

@larsbergstrom
Copy link
Author

Or @glennw, if you know how we usually update glutin :-)

@emilio
Copy link
Member

emilio commented Oct 6, 2016

Yeah, we usually merge.

@bors-servo: r+

@bors-servo
Copy link

📌 Commit 5e9bef3 has been approved by emilio

@bors-servo
Copy link

⚡ Test exempted - status

@bors-servo bors-servo merged commit 5e9bef3 into servo:servo Oct 6, 2016
bors-servo pushed a commit that referenced this pull request Oct 6, 2016
Update from upstream

r? @metajack @emilio

Do we normal do these updates as a `git merge tomaka/glutin` and then open the PR with a merge commit? Or do we rebase our branch on top of it and then do a yolo-force-push onto the servo branch? /me is confused...

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/glutin/107)
<!-- Reviewable:end -->
@larsbergstrom
Copy link
Author

Great - thanks a ton!

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.

None yet

5 participants