Skip to content

Commit

Permalink
Updates to git challenge instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
ryapric committed Jan 14, 2025
1 parent cbcf553 commit cb02de0
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
24 changes: 10 additions & 14 deletions instructions/challenge_6.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
Challenge 6: Git SSH Setup
==========================

We just got hired by a very famous movie star (who's name may not be disclosed)
We just got hired by a very famous movie star (whose name may not be disclosed)
to create a new version of our app for their specific use case. Our lead
engineers were working on putting together the new app, but they mysteriously
dissappeared while on a golfing trip a few weeks past. We were told that the
code was about ready to deploy, just hadn't gotten the chance to merge it into
the main branch. See if you can figure out how to get it up and running.
dissappeared while on a golfing trip a few weeks prior. We were told that the
code was just about ready to deploy, they just hadn't gotten the chance to merge
it into the `main` branch. So, now it falls to you to figure out how to get the
app deployed.

The name of the app is "carrot-cruncher". The last dev got the repo set up
somewhere on disk, but they never said where... hopefully you'll able to find
it. When you do, supposedly there was a new working branch pushed to the remote
repo, so you'll need to figure out how to authenticate to that repo.

There was a note in your team's documentation about a process that picks up keys
in the local git server. Supposedly all you had to do was copy some file to the
'ssh-keys/' directory near all the repos and git takes it from there? So I guess
try that? Then clone the remote branches down, then you'll be off to the
races... Good luck!
There was a note in your team's documentation about a process that picks up SSH
keys on the Git server. Supposedly all you had to do was copy (with `cp`) some
kind of key file to a directory called "ssh-keys" and the Git server takes it
from there. If you've ever set up a GitHub SSH key before, it's kind of like
that.
18 changes: 13 additions & 5 deletions instructions/challenge_7.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
Challenge 7: Git branch management
==================================

Great, now that you've got your SSH keys set up, you'll need to figure out which
of those remote branches have the correct changes it get it merged in ASAP. Once
you clone the repo, the working branch should be obvious... or so we were
told... So we recommend you just try looking at/running the code the the
different branches and see which one fits.
Great, now that you've got your SSH key set up, you'll need to do a few things
to get the code actually running:

* The name of the app is "carrot-cruncher". The last dev got the repo set up
somewhere on disk under `/opt`, so you'll need to find it first.

* Next, you'll need to figure out which of those remote branches have the
correct changes on it. Once you have the repo up to date, the working branch
should be obvious... or so we were told. So we recommend you just try looking
at and/or running the code the the different branches and see which one works.

* Once you find the working branch, merge it into the `main` branch and push it
to the remote.

0 comments on commit cb02de0

Please sign in to comment.