Resolve Git File Conflicts in One Simple Step

1. Open the conflicted file

utils/config.js

2. Delete all conflict markers and keep the desired code

Option A – Keep your local old version

Remove the sections between <<<<<<< HEAD and

>>>>>>> ab144a19901c5593760857037f2eddbe0fc4c569

, leaving only:

export const APP_VERSION_CODE = 259;
export const APP_VERSION_NAME = '2.26.1601';
export const IMG_BASE_URL = 'http://alyimg.xxxxxxxx.com';
export const ESIGN_BASE_URL = 'https://app.xxxxxxxx.com:8083';
export const API_BASE_URL = 'https://app.xxxxxxxx.com';

Option B – Use the remote new version (recommended)

Replace the whole file with the following code:

// 从 manifest.json 中读取应用版本信息
import manifest from '@/manifest.json';
export const APP_VERSION_CODE = Number(manifest.versionCode) || 260;
export const APP_VERSION_NAME = manifest.versionName || '2.26.0101';
export const IMG_BASE_URL = 'http://alyimg.xxxxxxxx.com';
export const ESIGN_BASE_URL = 'https://app.xxxxxxxx.com:8083';
export const API_BASE_URL = 'https://app.xxxxxxxx.com';

3. After resolving the conflict, run three commands

git add utils/config.js
git commit -m "解决版本号冲突"
git pull

Done

The conflict is resolved and no further errors will appear.

Quick recap

The symbols <<<<<, =====, >>>>> are conflict markers and must be removed manually.

Keep the correct code after editing.

Saving and running git add plus git commit finalizes the resolution.