PC SOFT

WINDEVWEBDEV AND WINDEV MOBILE
ONLINE HELP

Home | Sign in | English UK
  • Overview
  • How to proceed?
WINDEV
WindowsLinuxUniversal Windows 10 AppJavaReports and QueriesUser code (UMC)
WEBDEV
WindowsLinuxPHPWEBDEV - Browser code
WINDEV Mobile
AndroidAndroid Widget iPhone/iPadApple WatchUniversal Windows 10 AppWindows Mobile
Others
Stored procedures
Overview
If modifications have been performed in a branch, these modifications can be retrieved in the main version of the application.
Note: The branch modifications are bi-directional. The modifications can be applied from the main project to the branch or from the branch to the main project. The modified project is always the project that is opened. In the rest of this document, the example shows how the modifications made in the branch are applied in the main project.
How to proceed?
To retrieve the modifications performed in a branch:
  1. Open the main version of the project.
  2. Select "SCM .. Branches .. Retrieve modifications from a branch". The wizard for applying the modifications is displayed.On the "SCM" pane, in the "Project" group, expand "Branches" and select "Retrieve the modifications from a branch". The wizard for retrieving modifications starts.
  3. Select the branch containing the modifications to apply.
  4. Go to the next step.
  5. Select the elements containing the modifications to apply. You can apply:
    • All the modifications.
    • Only the modifications corresponding to some tasks or incidents.
  6. Go to the next step.
  7. For each element, you can:
    • Apply all the modifications performed ("All" button).Apply all the modifications performed ("Retrieve all" button).
    • Apply all the modifications performed EXCEPT some of them ("All except" button). In this case, you can select the modifications that must not be applied.Apply some of the modifications performed ("Select a part..." button). In this case, clicking on "Select a part" allows you to view the differences and choose those that must be applied.Apply a part of the modifications ("Merge..." button). In this case, clicking on "Merge" allows you to view the differences and choose those that must be applied.
    • Apply some of the modifications performed ("A part" button). In this case, you can select the modifications that must be applied.Don't apply the modifications ("No action " button).
  8. Go to the next step.
  9. The wizard presents the operations that are going to be performed. You have the ability to enter comments: they will be associated with the operation of retrieving changes from the branch.
  10. Validate. Depending on your choices, elements may have to be checked out.
Caution: The elements checked out for modification are not automatically checked back in. Don't forget to check these elements back in.
To retrieve the modifications performed in a branch:
  1. Open the main version of the project.
  2. On the "SCM" pane, in the "Project" group, expand "Branches" and select "Retrieve the modifications from a branch". The wizard for retrieving modifications starts.
  3. Select the branch containing the modifications to apply.
  4. Go to the next step.
  5. Select the modifications to be applied.
    You can apply:
    • All the modifications.
    • Only the modifications corresponding to some tasks or incidents.
    Note: "22-compatible mode" allows you to use the merge wizard found in versions 22 and earlier.
  6. Go to the next step.
  7. Some elements can be checked-out from the repository, if needed. Validate this check-out.
  8. In case of conflicts, the wizard displays the window to manage conflicting modifications.
    • When modifying the code of the same element, you have the ability to perform a "finer" code merge (you may have to simultaneously retrieve code lines from both versions). Clicking the "Edit the code" link opens a specific window used to "Merge code differences". This window simultaneously displays the code of current version ("My version" in green), the branch code ("<Branch name>" in purple) and the merge result in the middle.
    • In cases without conflicting code, simply click in the column of the desired version to report the change.
    See Window for merging differences for more details.
  9. Validate the wizard.
Caution: The elements checked out for modification are not automatically checked back in. Don't forget to check these elements back in.
Minimum version required
  • Version 11
This page is also available for…
Comments
Click [Add] to post a comment