diff options
| author | Shantanu Choudhary | 2009-08-21 16:22:56 +0530 |
|---|---|---|
| committer | Shantanu Choudhary | 2009-08-21 16:22:56 +0530 |
| commit | 330d1f18acd914c57a316a153a6bd238d84b7b6b (patch) | |
| tree | 16f55c1a32e2c9479a3661a93841e3dfdbece138 /versionControl/versionControl.rst | |
| parent | 666535b5623b34e3519d072a02710fc264f84bc3 (diff) | |
| parent | 4dd0ed8f1793991001b6ccd34d3623df8b1aac51 (diff) | |
| download | sees-330d1f18acd914c57a316a153a6bd238d84b7b6b.tar.gz sees-330d1f18acd914c57a316a153a6bd238d84b7b6b.tar.bz2 sees-330d1f18acd914c57a316a153a6bd238d84b7b6b.zip | |
Merged Madhu and Shantanu branches.
Diffstat (limited to 'versionControl/versionControl.rst')
| -rw-r--r-- | versionControl/versionControl.rst | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/versionControl/versionControl.rst b/versionControl/versionControl.rst index 9c22785..ce8ceb1 100644 --- a/versionControl/versionControl.rst +++ b/versionControl/versionControl.rst @@ -1,4 +1,4 @@ - +s Module 4: Version Control ========================= @@ -22,37 +22,39 @@ Suggested Reading: +=========+=================================+=========+ | 1 | Introduction to Course | 5 mts | +---------+---------------------------------+---------+ -| 2 | Why Revision Control? | 10 mts | +| 2 | Why Revision Control? | 5 mts | | | - Use case: for team | | | | - Use case: for single dev | | +---------+---------------------------------+---------+ -| 3 | Let there be Repository... | 15 mts | +| 3 | Learning the Lingo | 5 mts | ++---------+---------------------------------+---------+ +| 4 | Let there be Repository... | 15 mts | | | - Creating Repositpry. | | | | - Cloning existing Repo. | | | | - Branches concept | | +---------+---------------------------------+---------+ -| 4 | Navigating through history logs | 5 mts | +| 5 | Navigating through history logs | 5 mts | +---------+---------------------------------+---------+ -| 5 | Making changes in local branch | 15 mts | +| 6 | Making changes in local branch | 15 mts | | | - add | | | | - cp | | | | - rename | | | | - rm | | +---------+---------------------------------+---------+ -| 6 | Sharing the changes | 10 mts | +| 7 | Sharing the changes | 10 mts | | | - status | | | | - pull | | | | - update | | +---------+---------------------------------+---------+ -| 7 | Merging the changes | 20 mts | +| 8 | Merging the changes | 20 mts | | | - commit | | | | - glog | | | | - push | | | | - merge | | +---------+---------------------------------+---------+ -| 8 | Handling conflicts during merge | 20 mts | +| 9 | Handling conflicts during merge | 20 mts | +---------+---------------------------------+---------+ -| 9 | Exporting the changes: getting | | +| 10 | Exporting the changes: getting | | | | patch, diff | 10 mts | +---------+---------------------------------+---------+ @@ -60,3 +62,4 @@ Suggested Reading: *buffer time = 10 mts* +*For this course, working LAN is needed if Internet is not available.* |