Previous: PlasticSCM – Adding an existing VFP project
Cannot resolve image macro, invalid image name or id.
Cannot resolve image macro, invalid image name or id.
Cannot resolve image macro, invalid image name or id.
Now you can make your changes:
Cannot resolve image macro, invalid image name or id.
Go to Pending Changes view, and refresh using the semi-circular arrow on the left:
Cannot resolve image macro, invalid image name or id.
Regenerate text versions for Pending Changed files:
Cannot resolve image macro, invalid image name or id.
And refresh the Pending Changes view:
Cannot resolve image macro, invalid image name or id.
Then finally checkin and open Branch Explorer:
Cannot resolve image macro, invalid image name or id.
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:
Cannot resolve image macro, invalid image name or id.
And now merge your work branch (pay attention at where is the home icon):
Cannot resolve image macro, invalid image name or id.
You can see a new tab with a new merge view with the items about to merge:
Cannot resolve image macro, invalid image name or id.
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:
Cannot resolve image macro, invalid image name or id.
On the Branch Explorer view you can see a dotted green line indicating that the merge is not finished yet:
Cannot resolve image macro, invalid image name or id.
Because you must verify and confirm the changes (or revert them) in the Pending Changes view:
Cannot resolve image macro, invalid image name or id.
Now you confirm the changes and get back to Branch Explorer view:
Cannot resolve image macro, invalid image name or id.
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 checkin the check on the bottom):Cannot resolve image macro, invalid image name or id.
Cannot resolve image macro, invalid image name or id.
Cannot resolve image macro, invalid image name or id.
Now you can make your changes:
Cannot resolve image macro, invalid image name or id.
Go to Pending Changes view, and refresh using the semi-circular arrow on the left:
Cannot resolve image macro, invalid image name or id.
Regenerate text versions for Pending Changed files:
Cannot resolve image macro, invalid image name or id.
And refresh the Pending Changes view:
Cannot resolve image macro, invalid image name or id.
Then finally checkin and open Branch Explorer:
Cannot resolve image macro, invalid image name or id.
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:
Cannot resolve image macro, invalid image name or id.
And now merge your work branch (pay attention at where is the home icon):
Cannot resolve image macro, invalid image name or id.
You can see a new tab with a new merge view with the items about to merge:
Cannot resolve image macro, invalid image name or id.
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:
Cannot resolve image macro, invalid image name or id.
On the Branch Explorer view you can see a dotted green line indicating that the merge is not finished yet:
Cannot resolve image macro, invalid image name or id.
Because you must verify and confirm the changes (or revert them) in the Pending Changes view:
Cannot resolve image macro, invalid image name or id.
Now you confirm the changes and get back to Branch Explorer view:
Cannot resolve image macro, invalid image name or id.
Next: PlasticSCM – Working with branches with a second developer on same task