SVN SAFE USAGE GUIDE BY JONATHAN SUN A VERY

ENTER NAME OF CHURCH FACILITIES USAGE POLICY ERROR
1(2) PROVISION OF AND RESTRICTED USAGE UNDERTAKING RELATING TO
2014 ANGIE’S LIST SUPER SERVICE AWARD® TRADEMARK USAGE STANDARDS

6TH GRADE LANGUAGE USAGE NOUNS 2 NAME QUESTION
7TH GRADE LANGUAGE USAGE SENTENCES 3 NAME QUESTION
7TH GRADE LANGUAGE USAGE VERBS 3 NAME QUESTION 1

SVN Safe Usage Guide

by Jonathan Sun


A very good video explaning SVN using Tortoise SVN. Applies to Subclipse too.
http://www.youtube.com/watch?v=4WC44T89VrY

When using SVN, there are some guidelines that must be adhered to avoid major errors:

MAKE YOUR BRANCH
1. Go to respository explorer
2. Right click "trunk" --> Branch/Tag
3. --> Copy to URL: "svn://parallel02.usc.edu/csci201/M1/branches/YOUR_NAME_HERE
4. --> Type “Making a branch”
5. --> Finish

CHECK OUT YOUR BRANCH
1. Go to repository explorer
2. Right click your branch --> Checkout --> Finish

COMMIT TO BRANCH
1. Save all files
2. Right click branch project --> Team --> Commit
3. Type in a description of everything you changed --> OK

UPDATING YOUR BRANCH
1. Perform COMMIT TO BRANCH
2. Right click branch project --> Team --> Update to HEAD
3. Right click branch project --> Team --> Merge
4. --> Merge a range of revisions --> Next
5. --> Merge from "/trunk" --> Next
6. --> Binary Files: Resolve the conflict by using my version of the file --> Finish
7. Commit to your branch.

MERGING YOUR BRANCH INTO THE TRUNK
1. These directions must be followed exactly to avoid strange errors and conflicts.
2. Perform UPDATING YOUR BRANCH
3. If you haven't already, perform CHECK OUT on "trunk"
4. Right click trunk project --> Merge --> Reintegrate a branch --> Next
5. --> Merge from: "/branches/YOUR_NAME_HERE" --> Next
6. --> Binary Files: Resolve the conflict by using my version of the file --> Finish
7a. If the trunk project shows errors, right click the trunk project --> Team --> Revert --> OK  (now go fix your code in the branch!)
7b. If the trunk project shows no errors, right click trunk project --> Team --> Commit --> Type “reintegrating branch with DESCRIPTION OF FEATURES HERE” --> OK  (merge successful!)
8. Right click trunk project --> Delete --> Delete project contents on disk --> OK
9. Right click branch project --> Delete --> Delete project contents on disk --> OK
10. Go to repository explorer
11. Right click your branch --> Delete --> Type "Removing reintegrated branch" --> OK
12. To start fresh with a new branch, go to MAKE YOUR BRANCH


8TH GRADE LANGUAGE USAGE SENTENCES 1 NAME QUESTION 1
8th Grade Language Usage Verbals 2 Name Write the
8TH GRADE LANGUAGE USAGE VERBALS 3 NAME QUESTION 1


Tags: guide by, usage, jonathan, guide