fixing merging conflict

readme.md

@@ -219,4 +219,41 @@ set an email address that will be associated with each history marker
 
 set automatic command line coloring for Git for easy reviewing
 
-Je test sarahrm95
+### Saving your uncommitted work for a quick fix then getting it back
+
+>git stash
+
+temporarily stash your work since your last commit
+
+>git stash pop
+
+fetch your stashed work to continue it
+
+$ git stash pop stash@{2}
+
+in case you want to apply a specific Stash item (not the most recent one), you can provide the index name of that item in the "pop" option
+
+### Rewriting history 
+
+>git commit --amend -m "New commit message"
+
+replace the last commit
+
+>git commit --amend --no-edit
+
+replace the last commit without changing the commit message
+
+>git rebase -i {branch}
+
+take the precedent commit and add it to your branch
+
+### Ignoring files
+
+>touch .gitignore && echo {what you want to ignore} >> .gitignore
+
+create a file and specify what (extensions, directories, files) to ignore in it
+
+>git rm --cached {fileignored}
+
+remove from the tracking index a file that should be ignored but wasnt because already tracked when the ignore rule was created
+