<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
  <channel>
    <title>Forem: Louise Fitzpatrick Hayes</title>
    <description>The latest articles on Forem by Louise Fitzpatrick Hayes (@louhayes3).</description>
    <link>https://forem.com/louhayes3</link>
    <image>
      <url>https://media2.dev.to/dynamic/image/width=90,height=90,fit=cover,gravity=auto,format=auto/https:%2F%2Fdev-to-uploads.s3.amazonaws.com%2Fuploads%2Fuser%2Fprofile_image%2F76872%2F48a42d25-55fe-4a8e-9296-85a64c89ffb0.jpg</url>
      <title>Forem: Louise Fitzpatrick Hayes</title>
      <link>https://forem.com/louhayes3</link>
    </image>
    <atom:link rel="self" type="application/rss+xml" href="https://forem.com/feed/louhayes3"/>
    <language>en</language>
    <item>
      <title>A11y</title>
      <dc:creator>Louise Fitzpatrick Hayes</dc:creator>
      <pubDate>Fri, 15 Mar 2019 18:52:46 +0000</pubDate>
      <link>https://forem.com/louhayes3/a11y-29ik</link>
      <guid>https://forem.com/louhayes3/a11y-29ik</guid>
      <description>&lt;p&gt;Web Accessibility: also known as A11y (a numeronum A(11 chars)Y pronounced ally.&lt;/p&gt;

&lt;p&gt;I went to an A11y talk by Alex Brenon who is a member of the accessibility github team.&lt;br&gt;
&lt;a href="https://alexroseb.com/nerd"&gt;Her slides are available here&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;She talked about the less obvious use cases for making your site more accessible as well as the hearing and site impaired.&lt;/p&gt;

&lt;p&gt;Is it important to consider the cases where a site may be difficult to use.&lt;/p&gt;

&lt;p&gt;The standards for accessibility are set out by &lt;/p&gt;

&lt;p&gt;. W3CAG:  pronounced wocag.&lt;br&gt;
. WAI&lt;br&gt;
. W3C&lt;/p&gt;

&lt;p&gt;Some non obvious cases to affect a sites use is: &lt;br&gt;
. Low internet speed&lt;br&gt;
. Temporary injuries people get, can’t type for a while&lt;/p&gt;

&lt;p&gt;Everyone benefits from it.&lt;/p&gt;

&lt;h1&gt;
  
  
  Tota11y is common tag, as well as #a11y
&lt;/h1&gt;

&lt;p&gt;Highlights from the overview:&lt;br&gt;
Alt-text: description should be good,  but not too wordy just important parts&lt;br&gt;
Also helps with SEO (search engines)&lt;br&gt;
Screen readers read the alt tags. &lt;/p&gt;

&lt;p&gt;If Slow network the alt shows us first so everyone gains.&lt;/p&gt;

&lt;p&gt;Never use words such as 'pic of' or 'image' in alt text&lt;/p&gt;

&lt;p&gt;W3c site helps create a ratio for colour ratio: higher the better&lt;br&gt;
AA - levels of how much you are conforming to standards&lt;br&gt;
AAA - full set&lt;/p&gt;

&lt;p&gt;Think about how Perceivable you site is:&lt;br&gt;
Colours / alt text&lt;/p&gt;

&lt;p&gt;Is your site Operable?&lt;/p&gt;

&lt;p&gt;i.e. Keyboard friendly without mouse and Tab index accessibile and it makes sense sequentially and the Ordering: make sure there are Skiplinks at the top of page, brings you to the main content, without the navigation.&lt;/p&gt;

&lt;p&gt;The 3rd step of wcag is making your site understandable.&lt;/p&gt;

&lt;p&gt;Lang attribute in header,  and when language changes within content&lt;br&gt;
With span.&lt;/p&gt;

&lt;p&gt;Final thing is Robustness&lt;br&gt;
Good Html practices , Tag id once only, classnames clear.&lt;/p&gt;

&lt;p&gt;Check your site with an auto and manual Audit:&lt;br&gt;
&lt;a href="http://wave.webaim.org"&gt;Wave - by webaim&lt;/a&gt; &lt;/p&gt;

&lt;p&gt;&lt;a href="https://chrome.google.com/webstore/detail/axe/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US"&gt;Axe - a chrome extension you can add&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;Always check:&lt;br&gt;
Can you mute the sound?&lt;br&gt;
No mouse - Can you tab through&lt;br&gt;
No sight - alt tags for images.&lt;/p&gt;

&lt;p&gt;&lt;a href="https://reactjs.org/docs/accessibility.html"&gt;For further reading on ReactJS sites&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;Screen readers to check : Jaws and Nba&lt;br&gt;
Other usefull tools: Chrome lense&lt;/p&gt;

&lt;p&gt;Resources:&lt;br&gt;
&lt;a href="https://a11yproject.com/about"&gt;https://a11yproject.com/about&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;a href="https://theblog.adobe.com/different-breaking-accessibility-universality-inclusion-design/"&gt;https://theblog.adobe.com/different-breaking-accessibility-universality-inclusion-design/&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;a href="https://www.w3schools.com/html/html_accessibility.asp"&gt;https://www.w3schools.com/html/html_accessibility.asp&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;Alex is available at;&lt;br&gt;
@staralexb&lt;/p&gt;

&lt;p&gt;Thanks for reading! &lt;/p&gt;

</description>
      <category>a11y</category>
    </item>
    <item>
      <title>Git add an upstream to a forked repo</title>
      <dc:creator>Louise Fitzpatrick Hayes</dc:creator>
      <pubDate>Thu, 07 Mar 2019 17:29:49 +0000</pubDate>
      <link>https://forem.com/louhayes3/git-add-an-upstream-to-a-forked-repo-1mik</link>
      <guid>https://forem.com/louhayes3/git-add-an-upstream-to-a-forked-repo-1mik</guid>
      <description>&lt;p&gt;Thanks for taking the time to check this out! Please feel free to add helpful comments or feedback! &lt;/p&gt;

&lt;p&gt;This is a mini cheat sheet that assumes you are familiar with git, and have all tools installed, and a project terminal session open in your editor. &lt;/p&gt;

&lt;p&gt;This assumes you have &lt;a href="https://help.github.com/en/articles/fork-a-repo"&gt;forked a repo using the GIT gui&lt;/a&gt;.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git clone -v &amp;lt;git url&amp;gt;
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;To rebase your branch with the upstream branch (remote branch from which you forked your branch),&lt;/p&gt;

&lt;p&gt;you need add the branch to your list of 'remote branches' as an upstream, adding it to the list of remote branches visable via the git branch -av command.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout &amp;lt;your-origin-branchname&amp;gt; (e.g. git checkout master)
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Switched to branch 'your-origin-branch'&lt;br&gt;
Your branch is up-to-date with 'origin/your-origin-branch'.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git remote add upstream &amp;lt;remote branch url&amp;gt; 

e.g. git remote add upstream https://github.com/cypress-io/cypress.git

&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Adds the remote branch to your repo as upstream. To check this:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git remote -v
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;You should see:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git remote -v
origin  https://github.com/louise-hayes/Project-3-Speech.git (fetch)
origin  https://github.com/louise-hayes/Project-3-Speech.git (push)
upstream        https://github.com/peraltot/Project-3-Speech.git (fetch)
upstream        https://github.com/peraltot/Project-3-Speech.git (push)

&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Next, from within the your correct branch...&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git pull upstream &amp;lt;your-origin-branch&amp;gt;
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;This Updates your branch from upstream&lt;/p&gt;

&lt;p&gt;check all branch #'s to ensure all on same git#!&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -av
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;You will see: &lt;/p&gt;

&lt;ol&gt;
&lt;li&gt;your master (6266a2b) matches remote/upstream/master(6266a2b).&lt;/li&gt;
&lt;li&gt;your /remote/origin/master (6266a2b) matches remote/upstream/master(6266a2b).
These 3 repos (local master, upstream master and origin master) need to match.
&lt;/li&gt;
&lt;/ol&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -av
* master                          6266a2b Update README.md
  remotes/origin/HEAD             -&amp;gt; origin/master
  remotes/origin/master           6266a2b Update README.md
  remotes/origin/textfile-working ead5671 added body-parser, jquery for  calls to fix /saved POST
  remotes/upstream/master         6266a2b Update README.md


&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Hope this helps!&lt;/p&gt;

</description>
      <category>gitupstream</category>
      <category>gitfork</category>
      <category>gitpullupstream</category>
    </item>
    <item>
      <title>Git Cheat Sheet</title>
      <dc:creator>Louise Fitzpatrick Hayes</dc:creator>
      <pubDate>Wed, 20 Feb 2019 17:18:24 +0000</pubDate>
      <link>https://forem.com/louhayes3/git-cheat-sheet-koa</link>
      <guid>https://forem.com/louhayes3/git-cheat-sheet-koa</guid>
      <description>&lt;h1&gt;
  
  
  Best commands and steps for Error Free Git in a team.
&lt;/h1&gt;

&lt;p&gt;I use this regularly in work.&lt;/p&gt;

&lt;p&gt;I have seen projects fail when we do not have this in place and loose momentum, some of the team never get the hang of GIT because of the merge errors and issues that are easily avoidable. &lt;/p&gt;

&lt;p&gt;I have seen teams at my UNH bootcamp a few years ago loose confidence over git. &lt;/p&gt;

&lt;p&gt;At a recent &lt;a href="https://dev.to@MomsCanCodePgh"&gt;MomsCanCode&lt;/a&gt; hackathon, where I shared this on day 1 of the week long project, we had seamless code sharing , and most of the team had never used git before. Our team leader &lt;a href="https://dev.to@kudacoder"&gt;@kudacoder&lt;/a&gt; used this and then made a &lt;a href="https://www.useloom.com/share/b4c036c2af1b47489667d26b14cba9ed"&gt;Git Video&lt;/a&gt; to fill in the gaps for the newbie coders. Together these were invaluable. We won the hackathon with our Imposter Syndrome App called &lt;a href="https://realupapp.herokuapp.com"&gt;RealUp&lt;/a&gt; and I believe being able to share code easily was a key factor. &lt;/p&gt;

&lt;p&gt;This assumes you have git installed locally, and have created a &lt;a href="https://www.youtube.com/watch?v=LR5BYZjuXMU"&gt;git repo&lt;/a&gt; or have a repo to clone from.&lt;/p&gt;

&lt;p&gt;This is to hit the ground running for your first Team project, coming from coding and git commiting by yourself.&lt;/p&gt;

&lt;p&gt;FYI - Forking is only necessary if you are not a collaborator.&lt;br&gt;
After you have forked the repo (&lt;a href="https://help.github.com/articles/fork-a-repo/"&gt;https://help.github.com/articles/fork-a-repo/&lt;/a&gt;) from the github Desktop GUI&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git clone -v &amp;lt;GitForkedRepo&amp;gt; or &amp;lt;AnyRepoName&amp;gt;
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;From your project directory,&lt;/p&gt;

&lt;p&gt;create a .gitignore file, with at least one line such as&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;/node_modules 
/cypress
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Add in any other large npm libraries,  and any credential env files you do not wish on the team shared git repo.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git status
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;will show you are on correct branch, which should be your branch.&lt;/p&gt;

&lt;p&gt;Always pull down the most recent version of master before you start any changes with&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout master
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git pull
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Now you are on latest version but you can’t code in master so create or if already there switch to your branch&lt;/p&gt;

&lt;p&gt;To switch from master to your branch (and create it, if it does not exist)&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout -b your-branch
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;or if does exist and you just need to switch to your branch….&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout your-branch
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;After making your code changes.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git add .
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;This adds all your changes&lt;br&gt;
You can also&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git add file.ext file2.ext
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;to add specific files only (I recommend this almost 90% of the time to avoid accidentally adding massive libraries or to check you have only changed the files you meant to).&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git commit -m “desc of changes to be specific as possible”
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;Git push origin &amp;lt;your branch&amp;gt; 
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Never push to Master!!&lt;/p&gt;

&lt;p&gt;Go to the GitHub repo in the browser now, to create a pull request.&lt;br&gt;
Here you will auto have notification/check for conflicts. If no conflict merge to master and your done.&lt;br&gt;
(The steps to create a pull request is…another document!).&lt;/p&gt;

&lt;p&gt;After merging to master on the browser…&lt;/p&gt;

&lt;p&gt;Go back to terminal of project folder.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git Status
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout master
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;This is really important - you must pull down latest master, to see your new changes that are newly merged in master and make sure you have a working app or you could have introduced bugs. Also if you don’t do this, you will be working on an older version than everyone else!&lt;br&gt;
This will switch to masterbranch&lt;/p&gt;

&lt;p&gt;BUT YOUR CODE in visual code HAS NOT SWITCHED YET!!!! This can be confusing and causes people to loose changes as they think they have latest master but they don’t.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git pull
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;to get what is in the master to show in visual code so you don’t end up commit older version of code&lt;/p&gt;

&lt;p&gt;When you checkout master, you also have to pull (also FYI a pull is same as a git Fetch followed by git Merge).&lt;/p&gt;

&lt;p&gt;This sounds complicated but believe me this works!! There are many more commands we may need to use, but this is the every day, team coding bible for me!&lt;/p&gt;

&lt;p&gt;Following on from a git checkout master and git pull.&lt;br&gt;
either create a new branch (as in step 4) or&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout &amp;lt;previously used branch&amp;gt;
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git rebase master
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Now for the final check: You need to re-test your app to make sure all looks good before starting any new dev work. So many times people don't, and the merge and the app fails for someone else on team.&lt;/p&gt;

&lt;h2&gt;
  
  
  Other useful commands
&lt;/h2&gt;

&lt;p&gt;To remove a file you have just added via git add .&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git rm -f auth.json
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;(This only takes the file out of the staged for committing list!)&lt;/p&gt;

&lt;p&gt;To checkout a team members remote branch:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git fetch origin
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -v -a
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout -b branchname origin/branchname
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;if you need to rollback a merge i.e. after a git rebase master in your local independent branch&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout master
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git reset --merge
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;h3&gt;
  
  
  To check all versions
&lt;/h3&gt;



&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -va
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;h3&gt;
  
  
  To delete the local GIT branch we can try one of the following commands:
&lt;/h3&gt;



&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -d branch_name
git branch -D branch_name
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;h3&gt;
  
  
  To delete a remote branch you can use the following command:
&lt;/h3&gt;



&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git push &amp;lt;remote_name&amp;gt; --delete &amp;lt;branch_name&amp;gt;
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;h2&gt;
  
  
  To rebase your branch with the upstream/forked branch
&lt;/h2&gt;

&lt;p&gt;first add the remote forked branch to your remote branches as an upstream.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git checkout &amp;lt;your-origin-branchname&amp;gt; (e.g. git checkout master)
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Switched to branch 'your-origin-branch'&lt;br&gt;
Your branch is up-to-date with 'origin/your-origin-branch'.&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git remote add upstream &amp;lt;remote branch url&amp;gt; e.g. https://github.com/cypress-io/cypress.git

&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Adds the remote branch to your repo as upstream , check this:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git remote -v
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;You should see:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git remote -v
origin  https://github.com/louise-hayes/Project-3-Speech.git (fetch)
origin  https://github.com/louise-hayes/Project-3-Speech.git (push)
upstream        https://github.com/peraltot/Project-3-Speech.git (fetch)
upstream        https://github.com/peraltot/Project-3-Speech.git (push)

&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;





&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git pull upstream &amp;lt;your-origin-branch&amp;gt;
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;Updates your branch from upstream&lt;/p&gt;

&lt;p&gt;check all branch #'s to ensure all on same git#!&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -av
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;You will see: that your master (6266a2b) == remote/origin/master(6266a2b).&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git branch -av
* master                          6266a2b Update README.md
  remotes/origin/HEAD             -&amp;gt; origin/master
  remotes/origin/master           6266a2b Update README.md
  remotes/origin/textfile-working ead5671 added body-parser, jquery for  calls to fix /saved POST
  remotes/upstream/master         6266a2b Update README.md
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;To change a commit after the fact:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git commit --amend
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;To unstage a file from git add (reverse the git add)&lt;br&gt;
run&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git status
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;should tell you what to do if you want to unstage files&lt;/p&gt;

&lt;p&gt;option 1:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git rm /path/to/file
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



&lt;p&gt;option 2:&lt;br&gt;
&lt;/p&gt;

&lt;div class="highlight"&gt;&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git reset HEAD /path/to/file
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;



</description>
      <category>gitcheatsheet</category>
      <category>gitcommands</category>
      <category>gitfork</category>
    </item>
  </channel>
</rss>
