Skip to content

Commit

Permalink
Tweak docs for Challenges 6 & 7
Browse files Browse the repository at this point in the history
  • Loading branch information
ryapric committed Jan 10, 2024
1 parent 5b3e00a commit a70b87b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
21 changes: 11 additions & 10 deletions linux/instructions/challenge_6.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
Challenge 6: Git SSH Setup
==============================
==========================

We just got hired by a very famous movie star (who's 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
main. See if you can figure out how to get it up and running.
the main branch. See if you can figure out how to get it up and running.

The name of the app is carrot-cruncher. The last dev got the repo cloned somewhere,
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.
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 confluence 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... Goodluck!
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!
11 changes: 6 additions & 5 deletions linux/instructions/challenge_7.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Challenge 7: Git branch management
==============================
==================================

Great, now that you've got it cloned down, you'll need to figure out which
of those remote branches have the correct changes it get it merged in ASAP.
The working version should be obvious... or so we were told... So we recommend
you just try running the the different branches and see which one fits.
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.

0 comments on commit a70b87b

Please sign in to comment.