Changes between Version 17 and Version 18 of u/erica/GitRepos

Timestamp:

05/19/15 14:33:17 (10 years ago)

Author:

Erica Kaminski

Comment:

—

u/erica/GitRepos

@@ -108 +108 @@
 }}}
 
-Once you have done this, you want to switch back to your working branch so that you can merge the development branch into your working branch, rather than the other way around. This effectively changes the tree structure like so:
-
-
+Once you have done this, you want to switch back to your working branch so that you can merge the development branch into your working branch, rather than the other way around:
 
 {{{
@@ -117 +115 @@
 }}}
 
-Once this is merged, you then want to push those changes back into the repo., 
+
+The differences in the 2 situations is illustrated below:
+
+[[Image(branch_drawing.png, 45%)]]
+
+The 'good' option shows your changes going 'ahead' of the development branch, i.e. your branch contains the new additions to the development branch. The 'not-good' option, which would be you merging your branch ''into '' the development branch shows that this would update ''the development branch'' to have all of your changes. Ideally, this is left to the main developers of the code (i.e. Jonathan and Baowei), and only happens after thorough testing of any new/modified code.
+
+
+Once you have merged, you then want to push those changes back into the repo., 
 
 {{{
@@ -146 +152 @@
 to track the move.
 
+And lastly, note that one can not simply pull changes from different branches of the code; they are separate entities, unless connected by a branch. If you want changes from another person's development branch, you need to merge. Just think about which direction would be best.
 
 
 
+