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

Timestamp:

05/13/15 12:29:07 (11 years ago)

Author:

Erica Kaminski

Comment:

—

u/erica/GitRepos

@@ -56 +56 @@
 git pull
 }}}
+
+Once you have done this, then you want to merge it with your working branch,
+
+{{{
+git merge your_new_branch
+}}}
+
+Once this is merged, you then want to push those changes back into the repo., 
+
+{{{
+git push
+}}}
+
+*Note here, I think you can only 'copy' things back into the central repo that have been 'checked in'. 
+
+This will push whatever branch you are on back into the central repo (so for this example, that is the development branch).
+
+Once you are done with your edits, you can delete your local copies of the repos with,
+
+{{{
+git delete
+}}}
+
+(although, why is this necessary, can't you just delete your local copies by deleting the whole directory?)
+
+and can delete your branch in the central repo with the command,
+
+