matthodgson

If .DS_Store was never added to your git repository, simply add it to your .gitignore file.

If you don't have one, create a file called

.gitignore

In your the root directory of your app and simply write

matthodgson

Commencement 2021

Event Name and ID

All Colleges Ceremony - 17025

CAHSS - 17028

CNRS - 17029

matthodgson

Combining two git repositories

Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

• preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
• actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

NB: Check out git subtree/git submodule and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

matthodgson

h1, h4
{
color: #886406;
}

h2
{
color: #5c8021;
}

matthodgson

<h2>Saturday, May 19, 2018 <span>California's Toughest Century </span></h2>
<h3>Enjoy cycling through some of the most beautiful country in the United States. In addition to participating in an invigorating and challenging ride you will be helping to support the North Coast Community.</h3>
<div id="register">
<!-- <p><a href="http://www.bikereg.com/tour-of-the-unknown-coast"><img src="images/uploads/reg_online.gif" width="167" height="38" alt="Registrater online" /></a><br>
<a href="images/uploads/TUC16MailInEntry.pdf"><img src="images/uploads/form_download.gif" width="167" height="38" alt="Download Registration Form" /></a></p> -->
<p>
  <a href="http://my1.raceresult.com/74000/#0_2AE2D8" style="background:#74A71F;padding:5px;color:#fff;text-align:center;width:200px;margin-left:92px;">2017 Results</a></p>


  <div style="background: #fff; padding:10px 10px 20px 10px;margin-bottom: 30px;"><img src="{filedir_1}TUC-FINAL-_-GRAN-FONDO-01reallysmall.jpg" style="border: 0;" alt="image" width="490" height="757" /><

matthodgson

// Use Gists to store code you would like to remember later on
console.log(window); // log the "window" object to the console