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

fixes #1106 #1109

Merged
1 commit merged into from Nov 2, 2014
Merged

fixes #1106 #1109

1 commit merged into from Nov 2, 2014

Conversation

sebastianconcept
Copy link

This one looks like the right thing, please review

@ghost
Copy link

ghost commented Nov 1, 2014

AFAICT there is no way to squash-merge a PR in github. Please, squash the branch (git rebase -i master and select fix on all but first) and git push -f. Thanks.

@sebastianconcept
Copy link
Author

Done. It did well
`sebastian@suryia:amber (gh-1106)$ git rebase -i master
[detached HEAD 155de78] fixes #1106
Date: Sat Nov 1 20:34:02 2014 -0200
2 files changed, 70 insertions(+), 53 deletions(-)
Successfully rebased and updated refs/heads/gh-1106.
sebastian@suryia:amber (gh-1106)$ git push -f origin gh-1106
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 461 bytes | 0 bytes/s, done.
Total 5 (delta 4), reused 0 (delta 0)
To git@github.com:amber-smalltalk/amber.git

  • 1551018...155de78 gh-1106 -> gh-1106 (forced update)
    sebastian@suryia:amber (gh-1106)$ `

ghost pushed a commit that referenced this pull request Nov 2, 2014
@ghost ghost merged commit 4740878 into master Nov 2, 2014
@ghost ghost deleted the gh-1106 branch November 8, 2014 15:46
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant