I'm currently working on a project that needs to change the source code of git. I want to change the source code because when you setup a merge driver, git always runs it's diff algorithm first, but the git diff algorithm doesn't detects some conflicts that my merge tool detects.
So, I need to change the source code in order that git always uses my merge tool. To do that, I need to have a better understanding about the git merge code workflow, but reading million lines of git's source code is not an option. I need to compile and debug the git source code, but I have no idea of which is the better way and how to do it.
Please Help :)
So, after a time, I figured out how to solve my problem without messing around with the git source code. What I have done?
To do that, I edited the .gitconfig file and added this fake diff driver:
[diff "fake"] command = false
That solves my problem, because now the merge driver is always called :)
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.