Pulling Changes From Git Repository

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:

1. Click Git on the main toolbar.

2. In the Git panel, click Pull Changes.

   

   Click the image to enlarge it.

   Important notes:

   • Clicking the Pull Changes button will automatically save the project.

   • 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.

     Show image

     Show imageHide image

     

3. 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.

   

   Click the image to enlarge it.

   Merge Conflicts dialog

   Merge Conflicts dialogMerge Conflicts dialog

   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.

   Keyboard shortcuts

   Keyboard shortcutsKeyboard shortcuts

   Shortcut	Action
   ↑, ↓, ←, →	Navigate between conflicts.
   Enter	Resolve the selected conflict using the selected version (yours or theirs) and proceed to the next conflict.
   Left Shift + Enter	Resolve all the conflicts using yours.
   Right Shift + Enter	Resolve all the conflicts using theirs.

4. When all the conflicts are resolved, click Confirm Changes.

   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.

Pull via the Git project menu

See Also

Git Integration