Important
It is impossible to pull if the local and the remote repositories contain different projects. The comparison is made by the project IDs.
If you want to retrieve a different project from Git, clone it instead.
If your test project was updated, you need to pull the change from the remote Git repository to your computer. To do this:
Click Git on the main toolbar.
In the Git panel, click Pull Changes.
Note
Clicking the Pull Changes button will automatically save the project.
Handling uncommitted changes during pull: When you click Pull Changes, ReadyAPI will save your project automatically. If uncommitted changes are detected, a popup window will appear with the following message:
There are uncommitted changes detected from saving the project.Do you want to discard the changes and pull from remote?You can choose one of the following options:
Click No: The pull process will be aborted, and you can continue reviewing your uncommitted changes.
Click Yes: All uncommitted changes in your local files will be discarded. ReadyAPI will pull the latest changes from the remote repository and automatically reload your project. The pulled changes should now be visible in ReadyAPI.
Important
Ensure that you review your local changes carefully before selecting Yes, as this action cannot be undone.
The Pull Changes button is only available if your project is connected to a remote repository. If it is not, select Connect to Remote, and you will be taken through the connection process.
If ReadyAPI detects conflicts between your version and the remote branch, it will open the Merge Conflicts dialog. In the dialog, you can choose how to resolve each particular conflict.
The Merge Conflicts dialog shows the parts in the project that have conflicts between your version and the remote branch. It consists of three parts:
Yours shows what the part looks like in your local branch.
Theirs shows what the part looks like in the remote repository.
Result shows what the part will look like after you are done resolving conflicts.
To solve a conflict:
Select the conflict in any of the columns.
Decide what changes you want to apply – yours or theirs. You can see the details of the selected property in the Property Details sections under the columns.
Click the
button in the respective column.– or –
Click the respective Merge & Next button to merge the changes and proceed to the next conflict.
Tip
If you change your mind, you can return to the conflict and choose another option.
You can also select Merge All if you want to apply all the changes from yours or theirs. This will overwrite all the resolutions made previously.
When all the conflicts are resolved, click Confirm Changes.
Important
If you click Cancel, conflict resolutions will not be saved. You will have to resolve the conflicts again when you try to pull later on.
Right-click the project in the Navigator panel and select Git > Pull from the context menu.
— or —
Select Project > Git > Pull from the main menu.
Important
This action will automatically save the project.
Note
If the command is disabled, make sure you enable integration with Git.
If you have not connected your project to a remote repository yet, you will have to go through the connection process.
If ReadyAPI detects conflicts between your version and the remote branch, it will open the Merge Conflicts dialog. In the dialog, you can choose how to resolve each particular conflict.