@@ -397,38 +397,6 @@ Deleting a branch on GitHub_
397
397
(Note the colon ``: `` before ``test-branch ``. See also:
398
398
http://github.com/guides/remove-a-remote-branch
399
399
400
- <<<<<<< b3d268fa14cd1d19ac7ce337425602944b6e52b3
401
- =======
402
- Several people sharing a single repository
403
- ==========================================
404
-
405
- If you want to work on some stuff with other people, where you are all
406
- committing into the same repository, or even the same branch, then just
407
- share it via GitHub _.
408
-
409
- First fork matplotlib into your account, as from :ref: `forking `.
410
-
411
- Then, go to your forked repository GitHub page, say
412
- ``http://github.com/your-user-name/matplotlib ``
413
-
414
- Click on the 'Admin' button, and add anyone else to the repo as a
415
- collaborator:
416
-
417
- .. image :: pull_button.png
418
-
419
- Now all those people can do::
420
-
421
- git clone git@github.com:your-user-name/matplotlib.git
422
-
423
- Remember that links starting with ``git@ `` use the ssh protocol and are
424
- read-write; links starting with ``git:// `` are read-only.
425
-
426
- Your collaborators can then commit directly into that repo with the
427
- usual::
428
-
429
- git commit -am 'ENH - much better code'
430
- git push origin master # pushes directly into your repo
431
- >>>>>>> FIX github -> GitHub
432
400
433
401
Exploring your repository
434
402
=========================
0 commit comments