Changes

Jump to: navigation, search

DPS909 & OSD600 Winter 2017 - Git Walkthrough

2,378 bytes added, 16:21, 11 January 2017
Step 7: fixing common mistakes
</pre>
Later we discover that there are actually 2 occurances of '''color''' in that file, and we only changed the first one. Let's fix that and alter our commit using the <code>--amend</code> flag.
First, re-open the <code>docs/_includes/callout-warning-color-assistive-technologies.md</code> file in your editor, and correct the second '''color''' to '''colour'''. Then we can add and re-commit:
 
<pre>
$ git add docs/_includes/callout-warning-color-assistive-technologies.md
$ git commit --amend
</pre>
 
This will cause git to open your editor and let you edit your previous commit message. If you like it as is, just save the file and exit. NOTE: you can also use this method to fix a typo in your commit message, since it gives you a chance to change things.
 
After amending my commit, I can <code>git show</code> the commit and prove to myself that both uses of '''color''' have in fact been changed:
 
<pre>
commit 88f1a8976d7d7d6a031d1e8fe9c212a5a357650e
Author: David Humphrey (:humph) david.humphrey@senecacollege.ca <david.humphrey@senecacollege.ca>
Date: Wed Jan 11 16:14:17 2017 -0500
 
Switch color to colour in docs/_includes/callout-warning-color-assistive-technologies.md
 
diff --git a/docs/_includes/callout-warning-color-assistive-technologies.md b/docs/_includes/callout-warning-color-assistive-technologies.md
index b92a1c3..c1a4533 100755
--- a/docs/_includes/callout-warning-color-assistive-technologies.md
+++ b/docs/_includes/callout-warning-color-assistive-technologies.md
@@ -1,5 +1,5 @@
{% callout warning %}
#### Conveying meaning to assistive technologies
 
-Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (e.g. the visible text), or is included through alternative means, such as additional text hidden with the `.sr-only` class.
+Using colour to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the colour is either obvious from the content itself (e.g. the visible text), or is included through alternative means, such as additional text hidden with the `.sr-only` class.
{% endcallout %}
\ No newline at end of file
</pre>
 
 
* Client Server (SVN) and Distributed (Git)

Navigation menu