Code Pull Fails

Symptom

git pull fails and the following message is displayed, as shown in the following figure.

Figure 1 Error message

Analysis

The code differs between the cloud and local repositories. Therefore, when git pull is executed, the remote code will be merged to the local code. The dialog box displayed asks if you confirm the merge, and prompts you to enter a commit message.

Solution

Perform the following operations on the Git client:

1. Press i to enter the insert mode.
2. Enter a commit message.
3. Enter :wq and press Enter.