Skip to content

Support for Django 1.4 with python 2.5#4

Closed
buriy wants to merge 2 commits intocoddingtonbear:masterfrom
buriy:master
Closed

Support for Django 1.4 with python 2.5#4
buriy wants to merge 2 commits intocoddingtonbear:masterfrom
buriy:master

Conversation

@buriy
Copy link
Copy Markdown
Contributor

@buriy buriy commented Jul 24, 2013

jhmaddox/django-precompressed#1
("AttributeError: StringIO instance has no attribute 'name'")

@buriy
Copy link
Copy Markdown
Contributor Author

buriy commented Jul 24, 2013

How do I remove the second commit from the pull request?! :(

@coddingtonbear
Copy link
Copy Markdown
Owner

Oh, I'll be merging this into a branch anyway -- I'll make sure to omit the latter commit when I do that.

Usually when I post PRs, I post from a branch since github will automatically update open PRs with new commits posted on branches included in a request.

Thanks for the PR!

On Jul 24, 2013, at 8:37, Yuri Baburov notifications@github.com wrote:

How do I remove a second commit from the pull request?! :(


Reply to this email directly or view it on GitHub.

@duyu
Copy link
Copy Markdown
Contributor

duyu commented Jul 24, 2013

do you mean you wanto to revert back after a git pull?

Try ‘git reset' if you did not want this commit.
Try 'git revert' if you wanted to keep it and make another commit.

p.s. 'git reset' can only be done locally, it means you need to use 'git
revert' if you want to push your reverting to the server.

Anders Du

2013/7/24 Yuri Baburov notifications@github.com

How do I remove a second commit from the pull request?! :(


Reply to this email directly or view it on GitHubhttps://github.com//pull/4#issuecomment-21493742
.

@duyu
Copy link
Copy Markdown
Contributor

duyu commented Jul 24, 2013

great;)

btw, what does PR mean? post requests? not familiar with those
abbreviations;(

Anders Du

2013/7/24 Adam Coddington notifications@github.com

Oh, I'll be merging this into a branch anyway -- I'll make sure to omit
the latter commit when I do that.

Usually when I post PRs, I post from a branch since github will
automatically update open PRs with new commits posted on branches included
in a request.

Thanks for the PR!

On Jul 24, 2013, at 8:37, Yuri Baburov notifications@github.com wrote:

How do I remove a second commit from the pull request?! :(


Reply to this email directly or view it on GitHub.


Reply to this email directly or view it on GitHubhttps://github.com//pull/4#issuecomment-21494591
.

@duyu
Copy link
Copy Markdown
Contributor

duyu commented Jul 24, 2013

ah, excuse me guys, I thought there was someone writing to me...
Not good at the github yet;(

Anyway, thanks for your great works here;)

@coddingtonbear
Copy link
Copy Markdown
Owner

No worries @duyu, thanks for help, nevertheless.

@buriy -- merged into master moments ago as 32968aa.

Cheers!

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.

3 participants