Previous: PlasticSCM – Adding an existing VFP project
Create a new branch:
Image may be NSFW.
Clik here to view.
Fill in the name and description, and select the bottom checkbox:
Image may be NSFW.
Clik here to view.
The new branch was created:
Image may be NSFW.
Clik here to view.
Now you can make your changes:
Image may be NSFW.
Clik here to view.
Go to Pending Changes view, and refresh using the semi-circular arrow on the left:
Image may be NSFW.
Clik here to view.
Regenerate text versions for Pending Changed files:
Image may be NSFW.
Clik here to view.
And refresh the Pending Changes view, which now shows the generated text file:
Image may be NSFW.
Clik here to view.
Then finally checkin and open Branch Explorer:
Image may be NSFW.
Clik here to view.
Now you want to add this functionality to the next release v2_0, so let’s create a new branch for the release v2_0 from the last on production:
Image may be NSFW.
Clik here to view.
And now merge your work branch (pay attention at where is the home icon):
Image may be NSFW.
Clik here to view.
You can see a new tab with a new merge view with the items about to merge:
Image may be NSFW.
Clik here to view.
Then click the “process all merges” button at the top, and because this merge is automatic (nobody else has made changes) you can close this view using the (x) on the right of the tab:
Image may be NSFW.
Clik here to view.
On the Branch Explorer view you can see a dotted green line indicating that the merge is not finished yet:
Image may be NSFW.
Clik here to view.![plasticscm_en_work_21_Merge_View_Pending.png]( "plasticscm_en_work_21_Merge_View_Pending.png")
Because you must verify and confirm the changes (or revert them) in the Pending Changes view:
Image may be NSFW.
Clik here to view.![plasticscm_en_work_22_PendingChanges_view.png]( "plasticscm_en_work_22_PendingChanges_view.png")
Now you confirm the changes and get back to Branch Explorer view:
Image may be NSFW.
Clik here to view.![plasticscm_en_work_23_BranchExplorer_view.png]( "plasticscm_en_work_23_BranchExplorer_view.png")
Congratulations! Your changes are on the release!
Next: PlasticSCM – Working with branches with a second developer on same task
PlasticSCM – Working with branch per task
If you are a single developer, then you just want to create a branch for working (look how the home icon is changed to the new branch when selecting the check on the bottom):Create a new branch:
Image may be NSFW.
Clik here to view.
Fill in the name and description, and select the bottom checkbox:
Image may be NSFW.
Clik here to view.
The new branch was created:
Image may be NSFW.
Clik here to view.
Now you can make your changes:
Image may be NSFW.
Clik here to view.
Go to Pending Changes view, and refresh using the semi-circular arrow on the left:
Image may be NSFW.
Clik here to view.
Regenerate text versions for Pending Changed files:
Image may be NSFW.
Clik here to view.
And refresh the Pending Changes view, which now shows the generated text file:
Image may be NSFW.
Clik here to view.
Then finally checkin and open Branch Explorer:
Image may be NSFW.
Clik here to view.
Now you want to add this functionality to the next release v2_0, so let’s create a new branch for the release v2_0 from the last on production:
Image may be NSFW.
Clik here to view.
And now merge your work branch (pay attention at where is the home icon):
Image may be NSFW.
Clik here to view.
You can see a new tab with a new merge view with the items about to merge:
Image may be NSFW.
Clik here to view.
Then click the “process all merges” button at the top, and because this merge is automatic (nobody else has made changes) you can close this view using the (x) on the right of the tab:
Image may be NSFW.
Clik here to view.
On the Branch Explorer view you can see a dotted green line indicating that the merge is not finished yet:
Image may be NSFW.
Clik here to view.
Because you must verify and confirm the changes (or revert them) in the Pending Changes view:
Image may be NSFW.
Clik here to view.
Now you confirm the changes and get back to Branch Explorer view:
Image may be NSFW.
Clik here to view.
Congratulations! Your changes are on the release!
Next: PlasticSCM – Working with branches with a second developer on same task