initial commit

README.md

@@ -1,4 +1,5 @@
 #pending-task-group1
+<<<<<<< HEAD
 1. Fork this repo
 
 2. Clone this repo ( git clone https://github.com/hngi/Pending-Task-Group1)
@@ -10,3 +11,21 @@
 5. if you wish to checkout to a new branch (Git checkout -b branchname) OPTIONAL
 6. To add your changes after you have been assigned task (git status) to see your recent changes, (git add -A)to stage your changes, (git commit -m ‘ your commit message e.g your changes’), (git push origin Dev).to push changes
 7. To send a Pull Request use the git website and make sure the base branch is the dev branch do not pull to master.
+=======
+
+Fork this repo
+
+Clone this repo ( git clone https://github.com/hngi/Pending-Task-Group1)
+
+open git bash for windows or terminal for mac (cd pending-task-Group1) you can achieve this by dragging the folder in the command line after cd OR right click the pending-task-group1 folder and open with git bash or terminal
+
+To add upstream so that whenever there is a change you can pull the latest changes. (Git remote add upstream https://github.com/hngi/Pending-Task-Group1), to pull changes (git pull upstream Pending-Task-Group1)
+
+Commit your changes
+
+if you wish to checkout to a new branch (Git checkout -b branchname) OPTIONAL
+
+To add your changes after you have been assigned task (git status) to see your recent changes, (git add -A)to stage your changes, (git commit -m ‘ your commit message e.g your changes’), (git push origin Dev).to push changes
+
+To send a Pull Request use the git website and make sure the base branch is the dev branch do not pull to master.
+>>>>>>> 1d1e0c5a7096295d463bad6f8f3eac8375f148b4