Codelines and Branching
This section of the Knowledge Base augments the
Codelines and Branching chapter of the Perforce User Guide.
Articles
| |
|
Branching Codelines and Merging Changes
|
TASK:
How do I branch a codeline?
How do I merge changes between two codelines?
SOLUTION:
Briefly, you need to use the ...
|
|
Branching work in progress
|
PROBLEM:
How do I branch work in progress?
What do you do if you have completed work on opened files in your workspace and then realized that, for one reason or another, you are not allowed to subm...
|
|
Creating Vendor Branches for Third Parties
|
SUMMARY:
This tech note describes a strategy for setting up a "vendor branch" in your depot where you can submit source code modified by an outside source.
DETAILS:
When the third party delivers c...
|
|
Determining Revisions to Integrate
|
SUMMARY:
This article explains how Perforce determines which file revisions to integrate.
DETAILS:
This note describes how Perforce determines which source file revisions need integrating when you...
|
|
Indirect Integrations
|
SUMMARY:
This article explains how Perforce handles the integration of indirectly related files.
DETAILS:
Codelines that have been branched from one another using the ...
|
|
Merging Changes Between Unrelated Codelines
|
PROBLEM:
How do you merge changes between codelines that aren't branched from each other?
SOLUTION:
Consider the following situation. You have two codeline paths, "B" and "C", each of which was...
|
|
Sparse Branching
|
SUMMARY:
Branching a subset of project files, rather than branching an entire project tree, is often referred to as "sparse branching". A sparse branch might also be referred to in some contexts...
|
About This Page
Home
About Perforce
Contact
Site Map
RSS
Privacy Policy