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

Updated the URL for PyCrypto in the installation instructions to point to its current home. #467

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
2 participants
@paulehoffman

paulehoffman commented Nov 3, 2011

No description provided.

@bitprophet

This comment has been minimized.

Member

bitprophet commented Nov 4, 2011

Merged by hand into 1.1-master.

@bitprophet bitprophet closed this Nov 4, 2011

@paulehoffman

This comment has been minimized.

paulehoffman commented Nov 4, 2011

On Nov 4, 2011, at 11:55 AM, Jeff Forcier wrote:

Merged by hand into 1.1-master.

...which brings another unclarity for me about Git. You merged these into 1.1, not 1.3? Do you have some magic that will pull them into whatever comes after 1.3?

--Paul Hoffman

@bitprophet

This comment has been minimized.

Member

bitprophet commented Nov 4, 2011

"1.1-master" meant "1.1, 1.2, 1.3 and master", sorry.

master is the "main" line of development, so changes put into it will eventually be branched off as 1.4.

The trick to Git/etc is that branches are copies. So once something is added to the "trunk" of the "tree", it will be in any version of the code released afterwards.

If you google around for "version control release branches" you'll find descriptions of how all this works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment