I will try to do this Philip! Thanks
Em segunda-feira, 20 de fevereiro de 2017 19:04:33 UTC-3, Philip Oakley escreveu: > > Daniel, > > Is this (git using internal diff) also true if you have set a diff-driver > as well? > > Philip > > ----- Original Message ----- > *From:* Daniel Ferreira Maida <javascript:> > *To:* Git for human beings <javascript:> > *Cc:* [email protected] <javascript:> > *Sent:* Monday, February 20, 2017 6:14 PM > *Subject:* Re: [git-users] Git source code debugging > > Philip, > > Thanks for your answer. > > I'm using Ubuntu, but I have access to a windows machine. > > 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 (I need git to always calls the merge driver first than running > any diff algorithm). > > I've already read these articles but none of them worked for me :( > > Daniel. > > Em segunda-feira, 20 de fevereiro de 2017 14:07:26 UTC-3, Philip Oakley > escreveu: >> >> ----- Original Message ----- >> >> *From:* Daniel Ferreira Maida >> *To:* Git for human beings >> *Sent:* Monday, February 20, 2017 4:53 PM >> *Subject:* [git-users] Git source code debugging >> >> Hello! This is my first post here.n >> I need to do some changes in the git source code for a scientific >> research project. To be more precise, I need to change the behavior of git >> merge driver, conflict detection, etc. In order to do that, I need to debug >> the git source code to have a better understanding of the workflow of the >> project. But I have no idea of how I can do this, which IDE to use, how to >> setup the project, etc. >> >> Daniel, >> What OS are you on? If windows, try the Git-for Windows SDK. There is now >> a VS 2015 derivable project for understanding what is going on. >> >> *However*, have a look in the `git help attributes` ( >> https://git-scm.com/docs/gitattributes) for "Defining a custom merge >> driver", and obviously the `git help config` ( >> https://git-scm.com/docs/git-config#git-config-mergeltdrivergtname). It >> may be a much easier option than a deep dive into the source code! >> >> Philip >> > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
