tfs source control management
TRANSCRIPT
TFS Source Control
ManagementChaminda Chandrasekara
What we discuss today
Set up your dev machine and get started
Develop your app in a version-controlled codebase
Suspend your work
Contribute your work to the team
Isolate risk
View and manage past versions
Compare folders and files
Resolve Team Foundation Version Control conflicts
Work with version control locks
Set up your dev machine and get
started
Create a workspace and get the code
Local Workspace
Server Workspace
Work in a “Main” parent folder
Add your code to version control
Create a new solution under version control
Put an existing solution under version control
Develop your app in a version-
controlled codebase
Develop code and manage pending changes
Add files to the server
Download (get) files from the Server
Check out and edit files
Rename or move files and folders
Delete or restore files and folders
Develop code and manage pending
changes
Work in Solution Explorer
Use the My Work page to manage your work
Use the Pending Changes page to manage your work
See what you changed
Undo your pending changes
Use the command prompt
Add files to the server
Download (get) files from the Server
Get Latest Version
Get Specific Version
Check out and edit files
Auto Check out
Manually Check out
Lock Type (Unchanged, checkout, checkin)
Rename or move files and folders
Move an item that is referenced by a code project
Move an item in Source Control Explorer
Rename an item in Visual Studio
Fix the outcome after you rename an item in your operating system
Delete or restore files and folders
Delete an item
Restore items you deleted from your dev machine using Visual Studio
Undo pending changes
Restore an item deleted from the server
Undelete
Restore items deleted from your dev machine outside of Visual Studio
Use a local workspace to restore an item you deleted outside Visual Studio
Use a server workspace to restore an item you deleted outside Visual Studio
Suspend your work
Suspend and resume your work from the My Work page
Shelve some changes
Find a shelveset
View and work with a shelveset
Contribute your work to the team
Specify the files you want to check in
Associate work items
Check in your changes
Resolve check-in policy warnings
Perform a gated check in
Subscribe to alerts
Isolate risk
Branch folders and files
Branch strategically
Merge folders and files
View where and when changesets have been merged
View the branch hierarchy of a team project
Associate a file type with a merge tool
Branching
2
MAIN
1.0
RELEASE
Bra
nch
Bra
nch/L
abel
Bra
nch
Bra
nch/L
abelSUPPORT
2.0
1.0
2.0
Bra
nch
1.1
1.1
RI
RI
Bra
nch/L
abel
1.0.1 1.1.1
When MAIN is ready to
release, create the
SUPPORT and RELEASE
branches at the same time.
The Release branch is a
read-only copy of what
was released, branch
only when you need to,
otherwise using labels is
sufficient.
When there is a new release to
SUPPORT from MAIN, a Baseless
Merge will be necessary to carry
unmerged changes to new branch
Bra
nch
DEV 2 2
RI
RI
RI
FI
FI
FI
FI
The DEV
branches are
created as
sequential
tasks
Reverse
Integration into
MAIN after
verification
testing
DEV-1
Forward
Integration on a
regular basis to
keep Dev
Branches in sync
Branching – Simple Trunk Based
1
MAIN
(Feature developments)
4.0.0.0
RELEASE
Bra
nch
Bra
nch
/Lab
el
Bra
nch
Bra
nch
/Lab
elSUPPOR
T
5.0.0.0
4.0.0.0
5.0.0.0
Bra
nch
4.1.0.0
4.1.0.0R
I
RI
Bra
nch
/Lab
el
4.0.0.1 4.1.0.1
Bra
nch
RI
RIFI
Dev1 (Isolated feature development)
Hot fix
FI – Forward Integration
RI – Reverse Integration
View and manage past versions
Get the history of an item
Get detailed information about what changes have been made to your files.
View file changes using annotate
You can annotate a file to learn who made changes and what changes they made in all earlier versions of the file.
Use labels to take a snapshot of your files
Use labels to take a snapshot of your files so that at a later date you can easily refer back to that snapshot.
Find and view changesets
Changesets make up the history of each item in version control. You can look at a changeset to get detailed information about past changes.
Roll back changesets
You can roll back the effects of one or more changesets.
Compare folders and files
Compare files
Compare folders
Folder comparison filters
Reconcile differences between two folders
Associate a file type with a file-comparison tool
Resolve Team Foundation Version
Control conflicts
Manage and get information about conflicts
AutoResolve All conflicts
AutoMerge an individual conflict
Manually resolve an individual conflict
Understand the automatic options
Work with version control locks
Understand lock types
Unchanged
checkin
checkout
Any questions?
