The last major piece of functionality we're going to do with Perforce is branching and merging.…You branch by right-clicking on your folder, in this case, and selecting Branch.…Now Perforce does branching in the depot, not with the physical folders, but within folders within the depot.…So what we're going to do is decide where we want to put our branch folder.…And because it's not a physical folder, it's not a good idea to put your branch inside…the folder with your main branch.…
You want to put it within the depot perhaps as a peer of your main branch.…So here's our source, depot/p1, and our target isn't going to be depot/p1, say b1 here.…We're actually we're going to put it up here. We're going to say -branch1/, and after we do the…branch we said automatically submit after branching the files.…We're going to go take a look at the depot, and when we refresh it we see that we now have two…different sets of folders in our depot.…
And these files are different, we haven't created two separate folders in our workspace,…
Author
Released
11/7/2012- Comparing centralized vs. distributed systems
- Saving changes and tracking history
- Using revert or rollback
- Working with the GUI tools
- Using IDE and shell integration
- Installing different systems
- Creating a repository
- Tagging code
- Branching and merging code
- Selecting a software version control system that's right for you
Skill Level Beginner
Duration
Views
-
Introduction
-
Welcome53s
-
-
1. Overview of Software Version Control
-
Demo one: Getting started11m 1s
-
2. Background of Software Version Control
-
Terminology4m 27s
-
3. Version Control Concepts
-
Reverting to a prior version1m 42s
-
Creating tags and labels1m 5s
-
Branching and merging4m 10s
-
Examining shell integration3m 26s
-
4. Subversion
-
Installation and setup3m 31s
-
Tagging1m 34s
-
Branching and merging5m 32s
-
-
5. Perforce
-
Tagging1m 7s
-
Branching and merging4m 37s
-
6. Microsoft Team Foundation Server (TFS)
-
Installation and setup3m 47s
-
Tracking history and tagging2m 15s
-
Branching and merging5m 53s
-
-
7. Git
-
Installation and setup3m 1s
-
Tagging2m 13s
-
Branching and merging3m 44s
-
-
8. Mercurial
-
Installation and setup1m 48s
-
Tagging1m 50s
-
Branching and merging4m 29s
-
-
Conclusion
-
Next steps1m 8s
- Mark as unwatched
- Mark all as unwatched
Are you sure you want to mark all the videos in this course as unwatched?
This will not affect your course history, your reports, or your certificates of completion for this course.
CancelTake notes with your new membership!
Type in the entry box, then click Enter to save your note.
1:30Press on any video thumbnail to jump immediately to the timecode shown.
Notes are saved with you account but can also be exported as plain text, MS Word, PDF, Google Doc, or Evernote.
Share this video
Embed this video
Video: Branching and merging