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

Closed
wants to merge 1 commit into
from

Projects

None yet

2 participants

@paulehoffman
Contributor

No description provided.

@bitprophet
Member

Merged by hand into 1.1-master.

@bitprophet bitprophet closed this Nov 4, 2011
@paulehoffman
Contributor

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
Member

"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