You are here:

Merging Files Between Branches

After you check in file changes, you may need to merge the changes to other branches to make them available to other users. You can merge files between branches by:

Promoting changes from a child branch up to the parent branch. See Promoting branches and Promoting files.
Rebasing changes from a parent branch down to a child branch. See Rebasing branches and Rebasing files.
Duplicating a set of changes made in one branch and applying them to another branch in the same mainline branch. When you duplicate changes, you choose the changes between two versions to merge into another branch. See Duplicating selected changes across branches.