Git Extensions merge error reporting problem

Enterprise 2023-10-05 17:51:17 views: null

1. Configure the git merge tool.
Open Git Extensions-Tools-Settings-Git-Set
mergetool path: select the kdiff3.exe installation directory.
Insert image description here

1. Complete the configuration of the merge tool first, and then reset the pushed or submitted content.

Submit the code again in Git Extensions, click OK, and the merge options will pop up. Just merge as needed.
Insert image description here

Guess you like

Origin blog.csdn.net/qq_39689711/article/details/130376525

Git Extensions merge error reporting problem

【Git】WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED error reporting problem resolution

Error reporting of oracle data merge into solves ORA-30926

Vue component props error reporting problem

Solve the problem of swagger reporting error 404

SpringBoot imports PageHelper dependency error reporting problem

Flutter GetXController dynamic Tabbar error reporting problem

Props error reporting or problem solving in Vue

Added error injection -- problem solving (local comments and error reporting functions)

“fatal: refusing to merge unrelated histories” Git error

Error fatal: refusing to merge unrelated histories when git merge dev

JSONArray.fromObjec(list).toString(); error reporting problem solving

vue-vli3.0 introduces element error reporting problem

[Record tomcat error reporting solution] The problem that the tomcat request component is not found

Solve the problem of error reporting when Mysql stores WeChat expressions

LocalDateTime type conversion error reporting problem in Vert.x

Unity introduces the error reporting problem of maven https link

uniapp series - a collection of error reporting or common problem handling

Solve the problem of vue jumping to the same route and reporting an error

WPF solves the problem of cross-thread access error reporting

Solve the problem of npm install -g @vue/cli error reporting

Python solves the problem of pip reporting error no suchoption: --bulid-dir.

Solve the problem of error reporting when repeatedly clicking the same route in Vue

How to solve the problem of externalizing error reporting on merchant workbench?

git problem ERROR: Repository not found

mysql Got error 28 from storage engine (insufficient disk space) Problem reporting, problem analysis and problem solving

[Transfer] solved Git error: error: You have not concluded your merge (MERGE_HEAD exists).

Summary of using git Extensions

git merge merge branches

Recommended

Face Wall Intelligence releases the Eurux-8x22B open source large model - it can be called the "science champion"

Kaiyuan Daily | Google supports Hongmeng to take over; open source Rabbit R1; Android phones supported by Docker; Microsoft’s anxiety and ambition; Haier Electric shuts down the open platform

Ranking

Jianzhi offer interview questions 68-II. The nearest common ancestor of a binary tree (recursive)

jQuery Mobile development 1-UI components

Summary of Kotlin function knowledge

[ZZ] The Naked Truth About Anisotropic Filtering

Diagnosis: record a recovery of abnormal CRASH storage caused the database to be unable to be opened normally

Redis introduction and Linux installation Redis

Experiment 2 Introduction to switches

glances open source command-line system monitoring tools introduced

Use of selector

vue3 handwriting a carousel picture

Daily

2024-05-06(6)

2024-05-05(0)

2024-05-04(18)

2024-05-03(8)

2024-05-02(0)

2024-05-01(4)

2024-04-30(36)

2024-04-29(5)

2024-04-28(12)

2024-04-27(29)