Frequently Asked Questions: Git

1. I forgot to add an upstream remote prior to creating my-feature-branch, how do I get back on track?

   Simply add the remote, and rebase your feature branch against upstream/master:

   git remote add upstream git@git.ligo.org:lscsoft/lalsuite.git
   git fetch upstream
   git checkout my-feature-branch
   git rebase upstream/master

2. My CI pipeline jobs keep timing out after 1 hour, what can I do?

   Timeouts are already set to 2h on lscsoft/lalsuite, but since the CI for your branches/MRs runs on your own fork, you have to make the same setting change there: head to your fork's page, click Settings, then CI/CD, then General pipelines, then under Timeout replace 1h with 2h.