Git, GitLab, and GitHub

For code below, Open Git (or Powershell, Terminal, Command Prompt, etc.) in directory of repository and use the relevant code.

1 Why It is Important to Use Git/Version Control

There are many reasons why it is important to use git/version control:

• It (GitHub/GitLab) provides backups of all files in the cloud
• It (GitHub/GitLab) allows you to access the files in the cloud from any computer with access to the internet, even if you are away from your local computer
• Version control provides history of all (committed) changes made to all files
• If you make a mistake in your code, you can easily revert to a prior version because you took snapshots (commits) of your files!
  • You don’t need to keep all the “commented out” lines of code
    • This allows you to write cleaner code, because you can remove commented out lines of code, knowing that you can easily recover them in your commit history
  • You don’t have to keep files or folders named “project_old” or whatever
    • This allows you to keep cleaner file/folder directories for your projects
• Git keeps all files for the project self-contained, which helps increase reproducibility
• It (GitHub/GitLab) allows easier collaboration with others on the project
• It (GitHub/GitLab) allows easier sharing with outside researchers

2 How to Use

2.1 To begin

1. Install git (https://git-scm.com/downloads)
2. Install GitHub Desktop app (https://desktop.github.com)
3. Create a Personal Access Token (https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html, archived at https://perma.cc/6ZH8-JNZC; or https://research-git.uiowa.edu/-/profile/personal_access_tokens, archived at https://perma.cc/7JPU-WDBS) on the UI GitLab instance (https://research-git.uiowa.edu) to access UI GitLab repositories from GitHub Desktop.
   • For application name, put “GitHub”
   • For expiration date, leave it blank
   • For scopes, select everything
4. When cloning a repository from UI’s GitLab instance using GitHub Desktop, GitHub Desktop will ask for your username and password. Enter your HawkID as your username and your UI GitLab Personal Access Token as your password.

2.2 Best practices working with version control

• Create a new repository (repo) whenever you start a new project
• Follow the Petersen Lab template for how to structure your repo (folder structure, .gitignore file, etc.):
  • https://research-git.uiowa.edu/PetersenLab/Template
• To collaborate with others:
  • Navigate to the repo on the UI GitLab website
  • When in the repo, click “Members”
  • Add the Collaborator
• Each time you want to work on the files in the repo, follow this cycle:
  1. Using the GitHub Desktop app, sync the repo files from the cloud to the repo on your local computer (i.e., fetch any repo updates to your local machine from the cloud)
     • Make sure to do this before many code changes so you are working with the latest version of files
  2. Do your work on the repo: make any code/file/folder additions, changes, or deletions
  3. Using the GitHub Desktop app, commit the changes
     • Commit changes to the cloud early and often; when deciding what to commit and when, try to group “similar changes” into the same commit (“like goes with like”)
     • Use a separate “commit” for each separable “functional unit” changed
  4. Using the GitHub Desktop app, sync the repo files from your local computer to the repo on the cloud (i.e., push all of your committed changes to the cloud)
     • Never leave file changes uncommitted or unsynced when you stop working on the repo for the day!

2.3 Instructions for using GitHub Desktop app with GitLab

• https://itnext.io/how-to-use-github-desktop-with-gitlab-cd4d2de3d104 (archived at https://perma.cc/S59R-3YT7)
• https://community.reclaimhosting.com/t/using-github-desktop-with-gitlab/876 (archived at https://perma.cc/ZPT9-KEQL)
• https://stackoverflow.com/questions/22639815/does-github-for-windows-work-with-gitlab (archived at https://perma.cc/99RR-6KLE)
• https://github.com/desktop/desktop/issues/852#issuecomment-402546848 (archived at https://perma.cc/3GCU-GTPU)
• https://github.com/desktop/desktop/issues/3816#issuecomment-421060974 (archived at https://perma.cc/N8RS-BFWR)

2.4 How to create a repo on local computer

1. Create repository on UI GitLab website (https://research-git.uiowa.edu)
2. Open GitHub Desktop app
3. Clone repository
4. Add .gitignore file (from Template project: https://research-git.uiowa.edu/petersenlab/Template/blob/master/.gitignore) to the root of the cloned project folder
5. Follow the Petersen Lab template for how to structure your repo (folder structure, .gitignore file, etc.): https://research-git.uiowa.edu/PetersenLab/Template
   • Note that a folder will not be synced if there are no files in them (i.e., if the folder is empty)
6. Sync file changes using GitHub Desktop (“Fetch origin”, “Push origin”)

2.5 How to add a pre-existing repo from the lab drive (RDSS/network share) to your computer

For example, the SRS-DataProcessing repo lives on the lab drive.

1. Make sure Dr. Petersen has given you collaborator access to the repo
2. Open GitHub Desktop app
3. Navigate to the folder location of the repo on the lab drive
4. Drag the .git folder within the repo to the GitHub Desktop app

2.6 How to clone a repo from GitLab to local

1. Navigate to relevant repo on GitLab (https://research-git.uiowa.edu)
2. Click Clone in right-hand corner, select Clone with HTTPS
3. Open GitHub Desktop App and click File, Clone Repository
4. Click the URL tab
5. Paste in the URL
6. Navigate to where you want to save it
   • The recommended location for your repos is to create a folder titled GitHub in your Documents folder, and to put repos in the GitHub folder (by default: PC: C:/Users/[USERNAME]/Documents/GitHub/; Mac: /Users/[user]/Documents/GitHub/) because various lab scripts try to read the lab functions from this location; it is NOT recommended to put git repos in a OneDrive folder because git files tend not to play nice with syncing services (e.g., OneDrive, Dropbox)
7. Click Clone
8. Enter your GitLab username as your username and your Personal Access Token as your password

2.7 How to add, modify, or delete files in a repo

1. Open relevant repo in GitHub Desktop app
2. Pull any repo updates from the server to the local files (“Fetch origin”, “Pull origin”)
3. Make necessary additions, modifications, and deletions to the files
4. Create commits for all changes in GitHub Desktop app (one commit per substantive change): Enter “Summary” and “Commit to master”
5. After making all changes and commits, push local file changes to the server using GitHub Desktop (“Fetch origin”, “Push origin”)

2.8 How to collaborate with others

1. Navigate to the repo on the UI GitLab website
2. When in the repo, click “Settings”
3. Click “Members”
4. Add the Collaborator

2.9 How to create a pull request

1. To create a pull request, you either need to have write permissions for the repo, or you need to create a fork of the repo. To fork the repo, see here: https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop#forking-a-repository (archived at https://perma.cc/GC9E-DF34)
2. After forking the repo (if necessary), sync the repo with the latest version from the cloud so you know you are editing the latest version of the files.
3. Make any changes to the files in the repo that you’d like to incorporate into the repo
4. Open a pull request with your changes: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork (archived at https://perma.cc/KAP3-L5L7)

2.10 How to clone a repo into local directory with a different folder name (directory must be empty)

1. Git Bash into directory

git clone https://research-git.uiowa.edu/petersenlab/srs/SRS-DataProcessing.git .
git remote set-url --add origin https://research-git.uiowa.edu/petersenlab/srs/SRS-DataProcessing.git
git remote -v

2.11 How to transfer a repo to a new location/group/subgroup

1. Create location/group/subgroup (e.g., PetersenLab/School Readiness Study)
2. When in the repo, click “Settings”
3. Go to “Advanced”, and click “Expand”
4. Go to “Transfer project”, and select the location/group/subgroup you want to transfer the repo to under “Select a new namespace”
5. In the local repo, edit the repo URL in the .git/config file
6. When asked for your password, enter your username (HawkID) and GitLab Personal Access Token

2.12 How to use large file storage (LFS)

1. Make sure the large files are not in the repo yet.
2. In GitHub Desktop, open the repo you want to use LFS for
3. In GitHub Desktop, select the Repository tab, then select Command Prompt or similar
4. In the command prompt, type (based on instructions from: https://docs.gitlab.com/ee/topics/git/lfs/; archived at https://perma.cc/6WMC-GTKN):

git lfs install          # initialize the Git LFS project
git lfs track "*.Rdata"  # select the file extensions that you want to treat as large files

5. This should have created a .gitattributes file in the repo. In GitHub Desktop, commit and push the .gitattributes file to the cloud version of the repo.
6. Copy the large files into the repo.
7. In GitHub Desktop, commit and push the large file to the cloud version of the repo.
8. (Or, if not using GitHub Desktop, can commit in the command prompt (https://docs.gitlab.com/ee/topics/git/lfs/)):

git add .                                            # add the large file to the project
git commit -am "insert name of commit message here"  # commit the file meta data
git push origin master                               # sync the git repo and large file to the GitLab server

9. When asked for credentials, use your HawkID as your username and your personal access token as your password

2.13 How to create a new repository on a shared network drive

1. Create a repo on GitHub or GitLab online
2. Open Git Bash on the desktop
3. Using Git Bash, set the current directory to the path where the new repo will be. For example, use the following command to clone to the School Readiness Study

cd "R:\Lab\Studies\School Readiness Study"

1. Next, go to GitLab or GitHub online and obtain the HTTPS URL to the new repository that was created. Clone the repository with the HTTPS link using Git Bash with the following command

git clone (HTTPS Link)

2.14 How to revert changes to a previous commit

1. Open the Github Desktop and navigate to the repository you would like to revert changes for
2. Next, click the history tab
3. Right click the commit you would like to revert back to, and select revert changes
4. Push the changes to the repo to complete the revision

revert changes

2.15 How to perform a partial commit

1. In GitHub Desktop, click the desired lines in the gutter
2. Create the commit, and leave the other changes for you to continue working on.

https://github.blog/2015-01-14-partial-commits-in-github-for-windows (archived at https://perma.cc/5U3V-YWRF)

2.16 How to copy a repo to a new repo

https://github.com/new/import

2.17 How to make a repository a template repository

https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-template-repository (archived at https://perma.cc/PYW5-KAP5)

2.18 How to create a respository from a template

https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template (archived at https://perma.cc/9E2C-MUCK)

3 Troubleshooting

3.1 GitHub shows all files as being changed even though the files haven’t changed

Windows and Mac use different line endings (https://github.com/Microsoft/WSL/issues/184; archived at https://perma.cc/F8UX-YJP3):

git config --global core.autocrlf true

3.2 Error: You are not allowed to push code to protected branches on this project

1. Make sure the owner of the repo unprotects the branch (https://stackoverflow.com/questions/32246503/fix-gitlab-error-you-are-not-allowed-to-push-code-to-protected-branches-on-thi; archived at https://perma.cc/98AF-N6BY)
2. Open the repo, click “Settings”, “Repository”, “Protected Branches”
3. Change “Allowed to merge” and “Allowed to push” to “Developers and Maintainers”, and click “Unprotect”

3.3 Error creating commit

git add -A
git status
git commit -m "Message"` (where "Message" is the summary message of the commit)
git push
git status

3.4 Undo commit (but retain file changes)

git reset --soft HEAD^

3.5 Error: Sync failed

git status
git push

3.6 Error: Sync failed -- Syncing would overwrite your uncommitted changes

https://stackoverflow.com/questions/23084822/github-some-uncommited-changes-would-be-over-written-by-syncing (archived at https://perma.cc/AP5S-G38B):

1. git stash -u
2. (perform manual sync in GitHub Desktop)
3. git stash pop

3.7 Error: Pipeline has failed for master

https://docs.gitlab.com/ee/topics/autodevops/#at-the-project-level (archived at https://perma.cc/3MAQ-ZBFF)

1. Open the repo in GitLab
2. Go to your project’s “Settings” > “CI/CD” > “Auto DevOps”
3. Disable (uncheck) the “Default to Auto DevOps pipeline”
4. Click “Save changes”

4 OLD

4.1 Creating Repo on Local Directory (if Directory is empty)

1. Create Repo on GitHub
2. Don’t add README yet
3. Open Git Shell, navigate to directory, and type:

git init
git remote add origin https://github.com/DevPsyLab/petersenlab.git
git remote -v

4. Drag and drop the folder with the repository into the GUI app
5. Add .gitignore file with .Rhistory

4.2 Creating Repo on Local Directory (if Directory is not empty)

1. Create Repo on GitHub
2. Don’t add README yet
3. Open Git Shell, navigate to directory, and type:

git init
git add .
git commit -m 'First commit'
git remote add origin https://research-git.uiowa.edu/itpetersen/PetersenLab.git
git remote -v
git push -u origin master

4. Drag and drop the folder with the repository into the GUI app
5. Add .gitignore file with .Rhistory

4.3 Creating R Scripts Repo on Lab Server

1. Create R Scripts Repo
2. Open R Scripts folder and delete .git folder
3. Open Git Shell and type:

git init
git add .
git commit -m 'First commit'
git remote add origin https://research-git.uiowa.edu/PetersenLab/R-Scripts.git
git remote -v
git push -u origin master

4. Move R Scripts folder to another location
5. Clone repo into folder:
   • open Git Shell
   • navigate to Z:\TDS II\Data\R Scripts\

   git clone https://research-git.uiowa.edu/PetersenLab/R-Scripts.git .

   The dot on the end of the git clone command means “the current directory”
6. Drag and drop the folder with the repository into the GUI app
7. Add .gitignore file with .Rhistory

---

---