[git-users] Re: git reports conflicts for files not mutually changed
Hi Philip! Thanks for the response. You are talking about different files: the file with (2+-) changes is "OutOfTimerCrossValidator.java" and the file in conflict is "OutOfTimeCrossValidator*Runner*.java". I found this on the documentation (https://git-scm.com/docs/merge-strategies), perhaps this is the case: > > *With the strategies that use 3-way merge (including the default, > recursive), if a change is made on both branches, but later reverted on one > of the branches, that change will be present in the merged result; some > people find this behavior confusing. It occurs because only the heads and > the merge base are considered when performing a merge, not the individual > commits. The merge algorithm therefore considers the reverted change as no > change at all, and substitutes the changed version instead.* > Em segunda-feira, 25 de maio de 2020 13:46:26 UTC-3, Philip Oakley escreveu: > > In the Merge Left marker it shows a very small change (2+-) for that file, > at least I think that's the file. > > Did you expect that? What was the change? Was it a white space or end of > line (eol) change)? > > You may have a 3-way merge (mergebase, left and right commits) detecting > the white space anomaly. > > P. > > On Monday, May 25, 2020 at 5:05:21 PM UTC+1, Guilherme Cavalcanti wrote: >> >> Dears, >> >> I am facing situations in which only one of the developers/branches >> changes a specific file, but git merge reports a merge conflict for that >> file. So, why is git reporting conflict for files not mutually changed? >> In the example below, the file "OutOfTimeCrossValidatorRunner.java" >> (underlined in red) is changed by only one of the parents of a merge >> commit, but git merge still reports a conflict for that file as you can see >> in the bottom of the image. >> As further observation, I printed the temporary files used/passed to git >> merge, and I noted that they are different from the files present in the >> commits. >> Thanks in advance. >> >> -- 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 git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/86dc5f99-fd0a-4b5a-a087-704103e02fde%40googlegroups.com.
[git-users] git reports conflicts for files not mutually changed
Dears, I am facing situations in which only one of the developers/branches changes a specific file, but git merge reports a merge conflict for that file. So, why is git reporting conflict for files not mutually changed? In the example below, the file "OutOfTimeCrossValidatorRunner.java" (underlined in red) is changed by only one of the parents of a merge commit, but git merge still reports a conflict for that file as you can see in the bottom of the image. As further observation, I printed the temporary files used/passed to git merge, and I noted that they are different from the files present in the commits. Thanks in advance. -- 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 git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/bd62af4b-05e1-492f-9db4-0f52d7d56ef9%40googlegroups.com.
Re: [git-users] Overriding the "git merge" command
Nice. Many thanks. I'll give it a try and inform here.. Em quinta-feira, 4 de agosto de 2016 13:15:57 UTC-3, Konstantin Khomoutov escreveu: > > On Thu, 4 Aug 2016 08:33:57 -0700 (PDT) > Guilherme Cavalcanti > wrote: > > > I am a PhD candidate researching about merge tools and doing > > experiments with git and github. > > I know that when the *git merge* command fails in presence of > > conflicts, it is possible to invoke external merge tools through the > > command* git mergetool* to resolve conflicts. > > I was wondering if is that possible to set the *git merge* command to > > call the external merge tool directly, in any situation, not only > > when there are conflicts. > > More specifically, as far as I know, the workflow is: > > > >1. call "git merge" > >2. if there is conflict, call "git mergetool" to invoke an > > external merge tool > > > > What I want is: > > > > > >1. call "git merge" to invoke an external merge tool > > > > Is that possible? If so, how? > > Supposedly yes -- via the so called "git attributes" > (run `git help attributes` to see the manual page). > One of the supported attributes is the "merge driver" which might be > set to a program to be invoked to perform a merge. > > I don't know if it's possible (or has any sense) to invoke an > interactive application through this mechanics, though. > -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Overriding the "git merge" command
Hello, I am a PhD candidate researching about merge tools and doing experiments with git and github. I know that when the *git merge* command fails in presence of conflicts, it is possible to invoke external merge tools through the command* git mergetool* to resolve conflicts. I was wondering if is that possible to set the *git merge* command to call the external merge tool directly, in any situation, not only when there are conflicts. More specifically, as far as I know, the workflow is: 1. call "git merge" 2. if there is conflict, call "git mergetool" to invoke an external merge tool What I want is: 1. call "git merge" to invoke an external merge tool Is that possible? If so, how? Thanks in advance. -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.