Skip to content

Commit

Permalink
render after resolving merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
erika-tyagi committed Sep 12, 2023
1 parent 44ac063 commit e3f670a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
3 changes: 1 addition & 2 deletions docs/git-faqs.html
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ <h2 data-number="1" class="anchored" data-anchor-id="faqs"><span class="header-s
<li><p><strong>What permissions should I give my collaborators?</strong><br>
In general, you should follow the <a href="https://en.wikipedia.org/wiki/Principle_of_least_privilege" target="_blank">principle of least privilege</a>, which means that you should give folks the minimum level of access they need, but no more than that. In most cases, this will be the <strong>Write</strong> role, but you should refer to GitHub’s <a href="https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization" target="_blank">guide</a> describing the different roles and what they allow. If you need elevated permissions for a repository, post a message in the <a href="https://theurbaninstitute.slack.com/archives/C6J9AALDR" target="_blank">#github Slack channel</a>.</p></li>
<li><p><strong>Are there other commands that can be helpful when using Git from the command line?</strong><br>
Definitely! Learning a few simple Bash commands can be helpful for navigating the command line. A few common commands include <code>pwd</code> (to print your current directory), <code>cd</code> (to change directories), and <code>ls</code> (to list the files in a directory). For an introduction to these, and other, commands, we recommend <a href="https://friendly-101.readthedocs.io/en/latest/commandline.html" target="_blank">this guide</a> from Friendly Django or <a href="https://happygitwithr.com/shell.html" target="_blank">this guide</a> from Happy Git with R.</p></li>
Definitely! Learning a few simple Bash commands can be helpful for navigating the command line. A few common commands include <code>pwd</code> (to print your current directory), <code>cd</code> (to change directories), and <code>ls</code> (to list the files in a directory). For an introduction to these commands and others, we recommend <a href="https://friendly-101.readthedocs.io/en/latest/commandline.html" target="_blank">this guide</a> from Friendly Django or <a href="https://happygitwithr.com/shell.html" target="_blank">this guide</a> from Happy Git with R.</p></li>
</ul>
</section>
<section id="additional-resources" class="level2" data-number="2">
Expand All @@ -184,7 +184,6 @@ <h2 data-number="2" class="anchored" data-anchor-id="additional-resources"><span
<li><a href="https://happygitwithr.com/" target="_blank">Happy Git and GitHub for the UserR</a></li>
<li><a href="https://www.amazon.com/Git-Pocket-Guide-Working-Introduction/dp/1449325866" target="_blank">Git Pocket Guide</a></li>
<li><a href="https://www.atlassian.com/git" target="_blank">Getting Git Right</a></li>
<li><a href="https://skills.github.com/" target="_blank">GitHub Skills</a></li>
<li><a href="https://speakerdeck.com/alicebartlett/git-for-humans" target="_blank">Git for Humans</a></li>
</ul>

Expand Down
5 changes: 2 additions & 3 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>

<meta charset="utf-8">
<meta name="generator" content="quarto-1.3.433">
<meta name="generator" content="quarto-1.3.324">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down Expand Up @@ -55,8 +55,7 @@
"search-more-matches-text": "more matches in this document",
"search-clear-button-title": "Clear",
"search-detached-cancel-button-title": "Cancel",
"search-submit-button-title": "Submit",
"search-label": "Search"
"search-submit-button-title": "Submit"
}
}</script>

Expand Down
6 changes: 3 additions & 3 deletions docs/search.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,21 +158,21 @@
"href": "git-faqs.html",
"title": "Git and Github FAQs",
"section": "",
"text": "Git and GitHub seem a little scary. How do I get started?\nStart by using these tools for solo work. It is the lowest stakes way to develop skills that will be valuable for collaboration.\nWhere can I go for help if I get stuck?\nRunning into errors is an inevitable part of working with Git and GitHub, but we’re here to help! Drop a message in the #github Slack channel when you have issues, or email Aaron Williams ([email protected]) or Erika Tyagi ([email protected]).\nCan I use Git and GitHub with projects that have confidential data stored on the Y Drive?\nYes! Read this guide for tips on how to do so.\nShould I use Git inside of Box? (i.e. turn a Box folder into a Git repository)\nNo – we strongly recommend keeping Box folders and GitHub repositories separate.\nWhat kinds of files should I track with Git?\nGenerally, you should only track code (i.e., scripts written in R, Stata, SAS, Python, etc.) with Git. You should not track large data files or binary files (i.e., Word, Excel files). There are occasions when tracking small data files with Git might make sense, but you should never store confidential data on GitHub (even in a private repository). We recommend getting familiar with .gitignore files, which can prevent you and your collaborators from accidentally pushing files to GitHub. GitHub provides hundreds of template .gitignore files for specific programming languages (e.g. R, Stata, or Python) or operating systems (e.g. Windows or MacOS) that can be useful as a starting point.\nHow do I add documentation to my repositories?\nUse README files to add context and documentation to your repos. These are Markdown files in the root of your directory named README.md that can help folks understand the structure and contents of your repo. Markdown Live Preview can be a useful tool to help with formatting.\nWhat permissions should I give my collaborators?\nIn general, you should follow the principle of least privilege, which means that you should give folks the minimum level of access they need, but no more than that. In most cases, this will be the Write role, but you should refer to GitHub’s guide describing the different roles and what they allow. If you need elevated permissions for a repository, post a message in the #github Slack channel.\nAre there other commands that can be helpful when using Git from the command line?\nDefinitely! Learning a few simple Bash commands can be helpful for navigating the command line. A few common commands include pwd (to print your current directory), cd (to change directories), and ls (to list the files in a directory). For an introduction to these, and other, commands, we recommend this guide from Friendly Django or this guide from Happy Git with R."
"text": "Git and GitHub seem a little scary. How do I get started?\nStart by using these tools for solo work. It is the lowest stakes way to develop skills that will be valuable for collaboration.\nWhere can I go for help if I get stuck?\nRunning into errors is an inevitable part of working with Git and GitHub, but we’re here to help! Drop a message in the #github Slack channel when you have issues, or email Aaron Williams ([email protected]) or Erika Tyagi ([email protected]).\nCan I use Git and GitHub with projects that have confidential data stored on the Y Drive?\nYes! Read this guide for tips on how to do so.\nShould I use Git inside of Box? (i.e. turn a Box folder into a Git repository)\nNo – we strongly recommend keeping Box folders and GitHub repositories separate.\nWhat kinds of files should I track with Git?\nGenerally, you should only track code (i.e., scripts written in R, Stata, SAS, Python, etc.) with Git. You should not track large data files or binary files (i.e., Word, Excel files). There are occasions when tracking small data files with Git might make sense, but you should never store confidential data on GitHub (even in a private repository). We recommend getting familiar with .gitignore files, which can prevent you and your collaborators from accidentally pushing files to GitHub. GitHub provides hundreds of template .gitignore files for specific programming languages (e.g. R, Stata, or Python) or operating systems (e.g. Windows or MacOS) that can be useful as a starting point.\nHow do I add documentation to my repositories?\nUse README files to add context and documentation to your repos. These are Markdown files in the root of your directory named README.md that can help folks understand the structure and contents of your repo. Markdown Live Preview can be a useful tool to help with formatting.\nWhat permissions should I give my collaborators?\nIn general, you should follow the principle of least privilege, which means that you should give folks the minimum level of access they need, but no more than that. In most cases, this will be the Write role, but you should refer to GitHub’s guide describing the different roles and what they allow. If you need elevated permissions for a repository, post a message in the #github Slack channel.\nAre there other commands that can be helpful when using Git from the command line?\nDefinitely! Learning a few simple Bash commands can be helpful for navigating the command line. A few common commands include pwd (to print your current directory), cd (to change directories), and ls (to list the files in a directory). For an introduction to these commands and others, we recommend this guide from Friendly Django or this guide from Happy Git with R."
},
{
"objectID": "git-faqs.html#faqs",
"href": "git-faqs.html#faqs",
"title": "Git and Github FAQs",
"section": "",
"text": "Git and GitHub seem a little scary. How do I get started?\nStart by using these tools for solo work. It is the lowest stakes way to develop skills that will be valuable for collaboration.\nWhere can I go for help if I get stuck?\nRunning into errors is an inevitable part of working with Git and GitHub, but we’re here to help! Drop a message in the #github Slack channel when you have issues, or email Aaron Williams ([email protected]) or Erika Tyagi ([email protected]).\nCan I use Git and GitHub with projects that have confidential data stored on the Y Drive?\nYes! Read this guide for tips on how to do so.\nShould I use Git inside of Box? (i.e. turn a Box folder into a Git repository)\nNo – we strongly recommend keeping Box folders and GitHub repositories separate.\nWhat kinds of files should I track with Git?\nGenerally, you should only track code (i.e., scripts written in R, Stata, SAS, Python, etc.) with Git. You should not track large data files or binary files (i.e., Word, Excel files). There are occasions when tracking small data files with Git might make sense, but you should never store confidential data on GitHub (even in a private repository). We recommend getting familiar with .gitignore files, which can prevent you and your collaborators from accidentally pushing files to GitHub. GitHub provides hundreds of template .gitignore files for specific programming languages (e.g. R, Stata, or Python) or operating systems (e.g. Windows or MacOS) that can be useful as a starting point.\nHow do I add documentation to my repositories?\nUse README files to add context and documentation to your repos. These are Markdown files in the root of your directory named README.md that can help folks understand the structure and contents of your repo. Markdown Live Preview can be a useful tool to help with formatting.\nWhat permissions should I give my collaborators?\nIn general, you should follow the principle of least privilege, which means that you should give folks the minimum level of access they need, but no more than that. In most cases, this will be the Write role, but you should refer to GitHub’s guide describing the different roles and what they allow. If you need elevated permissions for a repository, post a message in the #github Slack channel.\nAre there other commands that can be helpful when using Git from the command line?\nDefinitely! Learning a few simple Bash commands can be helpful for navigating the command line. A few common commands include pwd (to print your current directory), cd (to change directories), and ls (to list the files in a directory). For an introduction to these, and other, commands, we recommend this guide from Friendly Django or this guide from Happy Git with R."
"text": "Git and GitHub seem a little scary. How do I get started?\nStart by using these tools for solo work. It is the lowest stakes way to develop skills that will be valuable for collaboration.\nWhere can I go for help if I get stuck?\nRunning into errors is an inevitable part of working with Git and GitHub, but we’re here to help! Drop a message in the #github Slack channel when you have issues, or email Aaron Williams ([email protected]) or Erika Tyagi ([email protected]).\nCan I use Git and GitHub with projects that have confidential data stored on the Y Drive?\nYes! Read this guide for tips on how to do so.\nShould I use Git inside of Box? (i.e. turn a Box folder into a Git repository)\nNo – we strongly recommend keeping Box folders and GitHub repositories separate.\nWhat kinds of files should I track with Git?\nGenerally, you should only track code (i.e., scripts written in R, Stata, SAS, Python, etc.) with Git. You should not track large data files or binary files (i.e., Word, Excel files). There are occasions when tracking small data files with Git might make sense, but you should never store confidential data on GitHub (even in a private repository). We recommend getting familiar with .gitignore files, which can prevent you and your collaborators from accidentally pushing files to GitHub. GitHub provides hundreds of template .gitignore files for specific programming languages (e.g. R, Stata, or Python) or operating systems (e.g. Windows or MacOS) that can be useful as a starting point.\nHow do I add documentation to my repositories?\nUse README files to add context and documentation to your repos. These are Markdown files in the root of your directory named README.md that can help folks understand the structure and contents of your repo. Markdown Live Preview can be a useful tool to help with formatting.\nWhat permissions should I give my collaborators?\nIn general, you should follow the principle of least privilege, which means that you should give folks the minimum level of access they need, but no more than that. In most cases, this will be the Write role, but you should refer to GitHub’s guide describing the different roles and what they allow. If you need elevated permissions for a repository, post a message in the #github Slack channel.\nAre there other commands that can be helpful when using Git from the command line?\nDefinitely! Learning a few simple Bash commands can be helpful for navigating the command line. A few common commands include pwd (to print your current directory), cd (to change directories), and ls (to list the files in a directory). For an introduction to these commands and others, we recommend this guide from Friendly Django or this guide from Happy Git with R."
},
{
"objectID": "git-faqs.html#additional-resources",
"href": "git-faqs.html#additional-resources",
"title": "Git and Github FAQs",
"section": "2 Additional Resources",
"text": "2 Additional Resources\n\nGit Cheat Sheet\nHappy Git and GitHub for the UserR\nGit Pocket Guide\nGetting Git Right\nGitHub Skills\nGit for Humans"
"text": "2 Additional Resources\n\nGit Cheat Sheet\nHappy Git and GitHub for the UserR\nGit Pocket Guide\nGetting Git Right\nGit for Humans"
},
{
"objectID": "git-y-drive.html",
Expand Down

0 comments on commit e3f670a

Please sign in to comment.