Skip to content

Adding a reference section with a new book and line continuation style guide.#119

Merged
kennethreitz merged 5 commits into
realpython:masterfrom
guibog:master
Apr 23, 2012
Merged

Adding a reference section with a new book and line continuation style guide.#119
kennethreitz merged 5 commits into
realpython:masterfrom
guibog:master

Conversation

@guibog

@guibog guibog commented Apr 21, 2012

Copy link
Copy Markdown

By the way Python in a Nutshell is my preferred book about Python, but still can be improved. I would love if the hitchhiker guide could beat it!

Edit: Oh, I can edit pull request title and main comment, nice, but err, well. So github added a commit to this pullreq. Sorry if I messed anythings.

@guibog

guibog commented Apr 21, 2012

Copy link
Copy Markdown
Author

Hi, I am doing my first pull requests on Github, some things are not very clear to me, sorry if any mess occurs. For instance, it seems that I can't queue separate pull requests to you, so apparently my second request has been merged into this one, and its message is not accurate anymore. (Nor will be this one if you accept or drop the request in between.)

@guibog

guibog commented Apr 21, 2012

Copy link
Copy Markdown
Author

I am a bit of the corner-case paranoid style: what happens if I add a new commit to this pullreq just one second before you click on "accept"? Will the new patch be sneakily added to the book? Or this individual commit we get back home? Aya.

@kisielk

kisielk commented Apr 21, 2012

Copy link
Copy Markdown
Contributor

@guibog All changes that are pushed to the same branch will be merged as part of any existing pull request from that branch. In order to separate your changes in to separate pull requests it's standard practice to make a new branch for each pull request. Usually the workflow for unrelated changes is something like:

git clone <your fork>
git checkout -b patch-1 # Creates a new branch called patch-1 based on master
... make changes ...
git commit
git push

git checkout master # Back to master branch
git checkout -b patch-2 # Create another branch ...

@guibog

guibog commented Apr 22, 2012

Copy link
Copy Markdown
Author

@kisielk thanks for the tip.

@kennethreitz

Copy link
Copy Markdown
Contributor

Thanks!

kennethreitz pushed a commit that referenced this pull request Apr 23, 2012
Adding a reference section with a new book and line continuation style guide.
@kennethreitz kennethreitz merged commit 911d829 into realpython:master Apr 23, 2012
@kennethreitz

Copy link
Copy Markdown
Contributor

Great stuff.

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