Anonymous user
Open Source Comes to Campus/Curriculum/Directory: Difference between revisions
Open Source Comes to Campus/Curriculum/Directory (view source)
Revision as of 22:55, 18 April 2014
, 10 years ago→The Follow Up
imported>Shauna |
imported>Shauna |
||
Line 129:
= The Follow Up =
You might say "Wait! I want a recent copy of
There's totally a way to do it, but it's kind of complicated. If your mind is already full with the above activity, you should take a break, and come back to this later if you want to.
Line 168:
== Pulling from the original repository ==
You want to get the most up to date version of
git fetch $name
git merge $name/master
In our case, though, this
<blockquote>If a merge conflict didn't happen this time, you can force it to happen by checking to see the [https://github.com/FOSSdirectory/FOSSdirectory.github.io/commits/master the most recent change] in the original repository. Then, you can make a random edit on the same line as that change. Make sure to add and commit your change before continuing.</blockquote>
So now there are two different index.htmls, your local copy and the origin. How do you reconcile the two?
== Option A: Discard/keep within files ==
Line 193:
Dealing with merge conflicts can get messy, especially when there are a lot of changes and you want to keep things from both versions of the file.
In our case, though, we don't want to take things from each version of the file. We just want to update one file,
Luckily, there's a way to to this at the file level:
git checkout --theirs
Again, once you have done this you will need to [[Open_Source_Comes_to_Campus/Curriculum/Directory#Commit_and_push | add and commit]] your changes.
|