versionControl/versionControl.rst
changeset 7 eef24e2b0bac
parent 2 33a89c36184e
child 14 e0dc3f0ad2f6
equal deleted inserted replaced
3:f095fc984608 7:eef24e2b0bac
     1 
     1 s
     2 Module 4: Version Control
     2 Module 4: Version Control
     3 =========================
     3 =========================
     4 
     4 
     5 Module Objectives
     5 Module Objectives
     6 -----------------
     6 -----------------
    20 +---------+---------------------------------+---------+
    20 +---------+---------------------------------+---------+
    21 | Session | Topic  			    | Duration|
    21 | Session | Topic  			    | Duration|
    22 +=========+=================================+=========+
    22 +=========+=================================+=========+
    23 | 1	  | Introduction to Course          | 5 mts   |
    23 | 1	  | Introduction to Course          | 5 mts   |
    24 +---------+---------------------------------+---------+
    24 +---------+---------------------------------+---------+
    25 | 2	  | Why Revision Control?           | 10 mts  |
    25 | 2	  | Why Revision Control?           | 5 mts   |
    26 |	  |	- Use case: for team	    |	      |
    26 |	  |	- Use case: for team	    |	      |
    27 |	  |	- Use case: for single dev  |	      |
    27 |	  |	- Use case: for single dev  |	      |
    28 +---------+---------------------------------+---------+
    28 +---------+---------------------------------+---------+
    29 | 3       | Let there be Repository...	    | 15 mts  |
    29 | 3	  | Learning the Lingo              | 5 mts   |
       
    30 +---------+---------------------------------+---------+
       
    31 | 4       | Let there be Repository...	    | 15 mts  |
    30 |	  | 	- Creating Repositpry.	    |	      |     		
    32 |	  | 	- Creating Repositpry.	    |	      |     		
    31 |	  | 	- Cloning existing Repo.    |	      |		
    33 |	  | 	- Cloning existing Repo.    |	      |		
    32 |	  |	- Branches concept 	    |         |
    34 |	  |	- Branches concept 	    |         |
    33 +---------+---------------------------------+---------+
    35 +---------+---------------------------------+---------+
    34 | 4	  | Navigating through history logs | 5 mts   |
    36 | 5	  | Navigating through history logs | 5 mts   |
    35 +---------+---------------------------------+---------+
    37 +---------+---------------------------------+---------+
    36 | 5	  | Making changes in local branch  | 15 mts  |
    38 | 6	  | Making changes in local branch  | 15 mts  |
    37 |	  |	- add	    		    |	      |
    39 |	  |	- add	    		    |	      |
    38 |	  |	- cp			    |	      |
    40 |	  |	- cp			    |	      |
    39 |	  |	- rename		    |	      |  	
    41 |	  |	- rename		    |	      |  	
    40 |	  |	- rm			    |	      |	
    42 |	  |	- rm			    |	      |	
    41 +---------+---------------------------------+---------+
    43 +---------+---------------------------------+---------+
    42 | 6	  | Sharing the changes		    | 10 mts  |
    44 | 7	  | Sharing the changes		    | 10 mts  |
    43 |	  | 	- status		    |	      |
    45 |	  | 	- status		    |	      |
    44 |	  |	- pull			    |	      |
    46 |	  |	- pull			    |	      |
    45 |	  |	- update		    |	      |
    47 |	  |	- update		    |	      |
    46 +---------+---------------------------------+---------+
    48 +---------+---------------------------------+---------+
    47 | 7	  | Merging the changes		    | 20 mts  |
    49 | 8	  | Merging the changes		    | 20 mts  |
    48 |	  | 	- commit		    |	      |
    50 |	  | 	- commit		    |	      |
    49 |	  |	- glog			    |	      |
    51 |	  |	- glog			    |	      |
    50 |	  |	- push			    |	      |
    52 |	  |	- push			    |	      |
    51 |	  |	- merge			    |	      |
    53 |	  |	- merge			    |	      |
    52 +---------+---------------------------------+---------+
    54 +---------+---------------------------------+---------+
    53 | 8	  | Handling conflicts during merge | 20 mts  |
    55 | 9	  | Handling conflicts during merge | 20 mts  |
    54 +---------+---------------------------------+---------+
    56 +---------+---------------------------------+---------+
    55 | 9	  | Exporting the changes: getting  |	      |
    57 | 10	  | Exporting the changes: getting  |	      |
    56 |	  | patch, diff   	   	    | 10 mts  |
    58 |	  | patch, diff   	   	    | 10 mts  |
    57 +---------+---------------------------------+---------+
    59 +---------+---------------------------------+---------+
    58 
    60 
    59 *total session time = 110 mts*
    61 *total session time = 110 mts*
    60 
    62 
    61 *buffer time = 10 mts*
    63 *buffer time = 10 mts*
    62 
    64 
       
    65 *For this course, working LAN is needed if Internet is not available.*