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

use Git/git instead of Mercurial/hg #67

Closed
wants to merge 6 commits into from

Conversation

@matrixise
Copy link
Member

@matrixise matrixise commented Oct 21, 2016

Please, could you check this branch ? this branch is not complete because some files ask more work.

@matrixise
Copy link
Member Author

@matrixise matrixise commented Oct 21, 2016

work on communication.rst, devcycle.rst, documenting.rst, grammar.rst, index.rst and setup.rst

@matrixise
Copy link
Member Author

@matrixise matrixise commented Oct 21, 2016

patch for these issues: #46 and #50

@brettcannon
Copy link
Member

@brettcannon brettcannon commented Oct 21, 2016

Can you do this against the github branch?

@matrixise
Copy link
Member Author

@matrixise matrixise commented Oct 21, 2016

yep, I will propose to the github branch

@brettcannon
Copy link
Member

@brettcannon brettcannon commented Oct 21, 2016

You can try changing the base branch directly in this PR, but I didn't want to do it for you in case there were conflicts.

@matrixise
Copy link
Member Author

@matrixise matrixise commented Oct 21, 2016

I think there will be some conflicts, because there is a diff between master and github

CPython is developed using `Git <https://git-scm.com/>`_. The Git command line
program is named ``git``; this is also used to refer to Git itself. Git is
easily available for common Unix systems by way of the standard package manager;
under Windows, you might want to use the `TortoiseGit <http://tortoisegit.org/>`_

This comment has been minimized.

@brettcannon

brettcannon Oct 21, 2016
Member

It might be worth also linking to https://desktop.github.com/ as well at TortoiseGit.

This comment has been minimized.

@matrixise

matrixise Oct 21, 2016
Author Member

sure, we have some possibilities for a desktop interface for Git.

@matrixise matrixise changed the base branch from master to github Oct 22, 2016
@brettcannon
Copy link
Member

@brettcannon brettcannon commented Oct 28, 2016

@matrixise did you want to resolve the conflicts in this PR? Otherwise I can revert the changes in setup.rst so I can merge this PR.

@brettcannon
Copy link
Member

@brettcannon brettcannon commented Oct 28, 2016

I forked this PR so that the work @matrixise did could be used to close out the last GitHub migration milestone bug!

SerhiiNecheporenko referenced this pull request Nov 8, 2020
Co-Authored-By: Tim Peters <tim.peters@gmail.com>
Co-Authored-By: Terry Jan Reedy <tjreedy@udel.edu>
Co-authored-by: Brett Cannon <brettcannon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.