From 9a080d718c83df950da7be1c32aa2be8c681e28c Mon Sep 17 00:00:00 2001
From: NataliaLKB <natalialeebaltazar@gmail.com>
Date: Sat, 28 Mar 2015 21:31:37 +0000
Subject: [PATCH 1/3] merging wth master

---
 cheatsheet.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/cheatsheet.md b/cheatsheet.md
index 5b70d53..23a8760 100644
--- a/cheatsheet.md
+++ b/cheatsheet.md
@@ -17,3 +17,21 @@
 
 ##### Deleting a branch
 		git branch -d <branch name>
+
+##### Moving your changes to the staging area
+        git add <file name>
+
+##### Committing your changes
+        git commit -m '<commit message here>'
+
+##### Pushing your commit to the remote repository
+        git push origin <branch name>
+
+##### Creating a branch and moving onto it.
+        git checkout -b <new branch name>
+
+##### Merging changes from another branch, to your current branch
+        git merge <branch you want to merge with your current branch>
+
+##### Pulling remote changes into your local repo
+        git pull origin <branch name>

From e0ee009e48014fdeb0ac50bea4a77af831f2e1ce Mon Sep 17 00:00:00 2001
From: Natalia Baltazar <natalialeebaltazar@gmail.com>
Date: Tue, 31 Mar 2015 09:34:07 +0100
Subject: [PATCH 2/3] Changing cheatsheet.md title

---
 cheatsheet.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cheatsheet.md b/cheatsheet.md
index 23a8760..98a1dc6 100644
--- a/cheatsheet.md
+++ b/cheatsheet.md
@@ -1,4 +1,4 @@
-# Git Command Cheat Sheet (separate this out)
+# Git Command Cheat Sheet
 
 ##### Cloning your remote directory
 		git clone <remote directory>

From 7780e4a46bcea20438b6b5a9236f76da92b8b6e1 Mon Sep 17 00:00:00 2001
From: NataliaLKB <natalialeebaltazar@gmail.com>
Date: Tue, 31 Mar 2015 12:56:13 +0100
Subject: [PATCH 3/3] reverting back cheatsheet to try to create merge
 conflicts

---
 cheatsheet.md | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/cheatsheet.md b/cheatsheet.md
index d8aa9a4..5ba7629 100644
--- a/cheatsheet.md
+++ b/cheatsheet.md
@@ -1,19 +1,37 @@
 # Git Command Cheat Sheet
 
 ##### Cloning your remote directory
-		git clone <remote directory>
+    git clone <remote directory>
 
 ##### Checking that status of your local repository
-		git status
+    git status
 
 ##### Pulling down all branches in a remote repo, not just the default branch
-		git fetch --all
+    git fetch --all
 
 ##### Creating a new branch for you to work on
-		git branch <new branch name>
+    git branch <new branch name>
 
 ##### Moving onto a branch
-		git checkout <branch name>
+    git checkout <branch name>
 
 ##### Deleting a branch
-		git branch -d <branch name>
+    git branch -d <branch name>
+
+##### Moving your changes to the staging area
+    git add <file name>
+
+##### ommitting your changes
+    git commit -m '<commit message here>'
+
+##### Pushing your commit to the remote repository
+    git push origin <branch name>
+
+##### Creating a branch and moving onto it.
+    git checkout -b <new branch name>
+
+##### Merging changes from another branch, to your current branch
+    git merge <branch you want to merge with your current branch>
+
+##### Pulling remote changes into your local repo
+    git pull origin <branch name>