Home

Welcome to the data-labs wiki!

How does a cohort use the data lab repo?

Forking

Each cohort should fork this repo to the ironhack-datalabs account. The forked repo should use the following formula to name the repo:

CITY-MONTH-YEAR

For instance, for the October 2018 cohort at Madrid, the fork name should be madrid-oct-2018.

Syncing Fork

There can be local customizations to the fork but typically the fork should not sync back to the main repo. In some cases, the fork may need to sync with the main repo. Below describes how.

1. Check out the forked repo to your computer. Enter the repo directory and configure its Git to have an upstream pointing to the main repo by executing git remote add upstream https://github.com/ironhack-labs/data-labs.git.

   • You only need to do this once for each new repo checked out.
   • Reference

2. Once you configured the upstream, you can sync the upstream code to your local repo with git pull upstream master.

   • Reference
   • If you have custom development on the forked repo, you may have conflicts when you merge from upstream. That's why we don't recommend you to do heavy development on the forked repo. The best approach is to create new files but don't modify existing files.

3. After syncing with upstream, push the updated code to the forked repo with git push origin master.