Changes between Version 3 and Version 4 of Setting Up Git

Timestamp:

Nov 26, 2015, 11:04:13 AM (9 years ago)

Author:

alex

Comment:

--

Setting Up Git

@@ -21 +21 @@
 == Git usage instructions ==
 
-For the training, right click on the repo, select switch branches, and create a new branch named your name. Then, create packages based off the naming scheme [yourname].[projectname]. Once you're done, switch back to the master branch and merge your branch in.
-When merging, make sure you select "If a fast forward, create a merge commit."
+For the training, right click on the repo, select switch branches, and create a new branch named your name. Then, create packages based off the naming scheme [yourname].[projectname]. Once you're done, switch back to the master branch and merge your branch in.[[BR]]
+
+When merging, make sure you select "If a fast forward, create a merge commit."[[BR]]
+
+Remember the order of things:
+1. Make your changes to the code
+2. Commit your code to your local branch
+3. Push your local branch to the server
+4. When ready for review, merge your local branch with master
+5. Push master to the server