Branching and merging


show more Branching and merging provides you with in-depth training on Developer. Taught by Michael Lehman as part of the Fundamentals of Software Version Control show less
please wait ...

Branching and merging

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, ...

Branching and merging
Video duration: 4m 37s 2h 55m Intermediate

Viewers:

Branching and merging provides you with in-depth training on Developer. Taught by Michael Lehman as part of the Fundamentals of Software Version Control

Subject:
Developer
Software:
Git Mercurial ALM/TFS Perforce
Author:
please wait ...