Changes between Version 1 and Version 2 of u/erica/GitRepos

Timestamp:

05/13/15 12:23:58 (10 years ago)

Author:

Erica Kaminski

Comment:

—

u/erica/GitRepos

@@ -32 +32 @@
 Now shows you have 2 local checked out versions of the code, master and development, and that you are currently sitting in the development branch (marked by an '*').
 
+From there, if you want to begin making changes to the code, you must ''create'' a new branch off of the development branch, for which you will later merge with the development branch after you have tested your edits. 
 
-  drepository named astrobear in your current working directory.
+{{{
+git branch -b your_new_branch
+}}} 
 
-Switching to that repo and running the follow
+This will take the current version of the development code and create an offshoot of it (i.e. a copy of it) for you to then work with.
 
+As you make changes to this branch, note they will all be local to your working directory until you push those changes into the central repo. This means that if you were to delete your directory, your branch (and all of its changes) would cease to exist (i.e. no copy of it is present in the central repo until you push).
+
+When you are ready to push these changes to the repo, you would give the command, 
+
+{{{
+git push 
+}}}
+
+This pushes (i.e. copies) your current working branch into the central repo. So if you are working on *your_new_branch, then it will push a copy of your_new_branch into the repo.
+
+Now, the procedure for pushing changes into the development branch goes as follows. Once your changes are ready to go into the dev branch, you want to switch back to the development branch and update it so that your changes are going to be merged with the ''newest'' version of the dev branch. You do this with,
+
+{{{
+git checkout development
+git pull
+}}}