Skip to content
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

Some clean up #1283

Merged
merged 2 commits into from Mar 14, 2018
Merged

Some clean up #1283

merged 2 commits into from Mar 14, 2018

Conversation

henri-hulski
Copy link
Member

No description provided.

@christianalfoni
Copy link
Member

There seems to be something weird going on with the history here? :)

@schotime
Copy link
Collaborator

@henri-hulski you need to rebase upstream/next

@henri-hulski henri-hulski changed the base branch from master to next February 25, 2018 09:41
@henri-hulski
Copy link
Member Author

henri-hulski commented Feb 25, 2018

Sorry I made the PR from command line and forgot to add the -b flag. (Again! :( )

$ git pull-request -b next

(You need Hub to do this.)

But there's still something wrong. Seems that @christianalfoni has merged in master. :)
Will try to fix from laptop.

@henri-hulski
Copy link
Member Author

Ok, it's fixed now!

Copy link
Member

@christianalfoni christianalfoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@henri-hulski henri-hulski merged commit 5d8a8d3 into next Mar 14, 2018
@henri-hulski henri-hulski deleted the cleanup branch March 14, 2018 16:58
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.

None yet

3 participants