Skip to content

Commit

Permalink
remove dupe text
Browse files Browse the repository at this point in the history
  • Loading branch information
librarianrafia committed Dec 15, 2023
1 parent 816d48a commit c3b5eb3
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions docs/introgitandgithub.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ There are three main approaches you can take:
- [See these directions from Berkeley Statistics](https://statistics.berkeley.edu/computing/faqs/git-auth)
- For additional directions, [see Github's Authentication documentation](https://docs.github.com/authentication)


___
# Getting Started with Git and GitHub (Workshop)

Expand Down Expand Up @@ -647,10 +646,18 @@ After adding a descriptive message, click the green button to finalize the pull

Now it's up to the repository owner if they wish to accept the request, initiate a conversation with you, or—which sometimes happens—ignore or reject your request. In the case of the DHRI curriculum, we may accept some requests right away, and ask for clarification on other occasions.


# Conflicts
[What do I do when my changes conflict with someone else’s?](https://swcarpentry.github.io/git-novice/09-conflict.html)

# Collaborating
[How can I use version control to collaborate with other people?](https://swcarpentry.github.io/git-novice/08-collab.html)
A BASIC COLLABORATIVE WORKFLOW
* In practice, it is good to be sure that you have an updated version of the repository you are collaborating on, so you should git pull before making our changes. The basic collaborative workflow would be:
- update your local repo with git pull origin main,
- make your changes and stage them with git add,
- commit your changes with git commit -m, and
- upload the changes to GitHub with git push origin main
It is better to make many commits with smaller changes rather than of one commit with massive changes: small commits are easier to read and review.

## Challenge

Expand All @@ -659,7 +666,7 @@ Now it's up to the repository owner if they wish to accept the request, initiate
3. Make changes to the files on your local machine. Remember to save them!
4. Use the 3-step process of stage, commit and push to return the amended files to the repository on GitHub.

## Solution
### Solution

Rather than write out the solution here, I want to encourage you to go back through the lessons as needed.

Expand All @@ -668,13 +675,5 @@ You'll know you've completed step one when the project folder (called `\introduc
After you've made and saved the changes, you'll know you've completed step three when your changes appear in the project folder on _your_ GitHub account.


# Collaborating
[How can I use version control to collaborate with other people?](https://swcarpentry.github.io/git-novice/08-collab.html)
A BASIC COLLABORATIVE WORKFLOW
* In practice, it is good to be sure that you have an updated version of the repository you are collaborating on, so you should git pull before making our changes. The basic collaborative workflow would be:
- update your local repo with git pull origin main,
- make your changes and stage them with git add,
- commit your changes with git commit -m, and
- upload the changes to GitHub with git push origin main
It is better to make many commits with smaller changes rather than of one commit with massive changes: small commits are easier to read and review.


0 comments on commit c3b5eb3

Please sign in to comment.