[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.
[git-users] post-merge doesn't work.
Dears,
Well, I tried and I'm trying new tests with Githook, Can I change owner
directories and files for apache?
Because, I try add script with name post-merge on directory hooks, but when
I execute command git pull, don't execute my scripts. Any idea? I look
inumerals howtoo.
When I customize my hooks working, but the specific script post-merge
doesn't work. I tried create a temporary file on /tmp/ directory and use
command chown for change permitions of my Document Root.
I use Git pull to replicate my files of GLPI:
cat .githooks/post-merge ( Detail: I use chmod +x on script)
#!/bin/bash
sudo chown apache:apache /var/www/html/glpi -R
sudo touch /tmp/file.txt
runuser -l root -c 'sudo chown apache:apache /var/www/html/glpi -R'
runuser -l root -c 'sudo touch /tmp/test'
sudo find /var/www/html/glpi -mount -user root -exec chown apache: -R {} \;
2>/dev/null
Mini tutorial:
mkdir .git/hooks
mkdir .githooks
git config core.hooksPath .githooks
find .git/hooks -type l -exec rm {} \;
find .githooks -type f -exec ln -sf ../../{} .git/hooks/ \;
ls
Erros-relatados.md files-upgrade glpi glpi.old README.md
My config: "git config --list"
user.email=x...@gmail.com
user.name=root
push.default=simple
pull.ff=no
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
You have new mail in /var/spool/mail/root
###
Git Client
[root@vm-dc-xxx2 test]# git init
Initialized empty Git repository in /var/www/html/.git/
[root@vm-dc-xxx2 test]# git pull --no-ff
http://127.0.0.1:3000/root/-glpi.git
remote: Counting objects: 12834, done.
remote: Compressing objects: 100% (5278/5278), done.
remote: Total 12834 (delta 7205), reused 12829 (delta 7204)
Receiving objects: 100% (12834/12834), 587.29 MiB | 14.40 MiB/s, done.
Resolving deltas: 100% (7205/7205), done.
>From http://127.0.0.1:3000/root/-glpi
* branch HEAD -> FETCH_HEAD
[root@vm-dc-xxx2 test] ls -la
total 32
drwxr-xr-x. 7 root root 4096 Mar 29 15:23 .
drwxr-xr-x. 4 root root 33 Mar 13 16:03 ..
-rw-r--r--. 1 root root 2201 Mar 29 14:48 Erros-relatados.md
drwxr-xr-x. 4 root root 4096 Mar 29 14:48 files-upgrade
drwxr-xr-x. 8 root root 4096 Mar 29 15:19 .git
drwxr-xr-x. 2 root root 4096 Mar 29 15:12 .githooks
drwxr-xr-x. 18 root root 4096 Mar 29 14:49 glpi
drwxr-xr-x. 16 root root 4096 Mar 29 14:48 glpi.old
-rw-r--r--. 1 root root 1354 Mar 29 14:48 README.md
--
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.
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 <guiga...@gmail.com > 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.
[git-users] Copyright on wildmatch.c
Hello, I'm trying to implement support for gitignore files in the_silver_searcher (https://github.com/ggreer/the_silver_searcher). It is a source code optimized version of grep. And it is way faster than ack. The problems at hand is that I'd like to use wildmatch.c and some dependencies (hex.c, some portions of compat-util.h) but it seems that git is GPL whereas tss is Apache2 licensed. Is there any possibility to re-license the files above to Apache2 for the TSS project? If not, is there any c library that provides support gitignore patterns? Thank you very much, Bufolo -- 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.
Re: [git-users] Copyright on wildmatch.c
Hi, quickly after posting to this mailing i realized that and sent a copy to the dev list. Thanks for the clarification. On Tue, Feb 24, 2015 at 1:55 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Tue, 24 Feb 2015 09:02:21 +0100 Guilherme guibuf...@gmail.com wrote: [...] The problems at hand is that I'd like to use wildmatch.c and some dependencies (hex.c, some portions of compat-util.h) but it seems that git is GPL whereas tss is Apache2 licensed. Is there any possibility to re-license the files above to Apache2 for the TSS project? [...] This is a wrong mailing list to ask such a question: here, we deal with problems end-users have with Git, and this list has nothing to do with development of Git and its source code licensing. You should direct this question to the main Git mailing list, which is git at vger.kernel.org (see [1] for more info). Note that you might need to solicit explicit permission for relicensing from all who contributed to those files. On the other hand, when a quesion arose a couple of years ago about using bits of Git string manipulation library somewhere, the response of the devs I've seen on the list was positive so your chances are high IMO. 1. https://gist.github.com/tfnico/4441562 -- 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] Different behaviour for git add with ignored files
Hello, In my .git/info/exclude i have the patterns: !COM/config/Project.gny (...) other ignores /COM/config (...) more ignores When i do git add -- COM/config/Project.gny I get no warnings or abort about the ignored path (as i expect) but git add -- COM/config/Project.gny COM/otherfile.c It outputs: The following paths are ignored by one of your .gitignore files: COM/config Use -f if you really want to add them. fatal: no files added I don't understand the difference in the behaviour. Is this intended? Thank you. -- 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.
Re: [git-users] On bash doing git add '' some-existing-file troubles
Hello Roman, Ok, so you and i have pretty much the same opinion. This behaviour is undocumented and i'd say dangerous. I will file a bug report. Thank you all for your help. On Mon, Nov 17, 2014 at 5:04 PM, Roman Neuhauser neuhau...@sigpipe.cz wrote: # wor...@alum.mit.edu / 2014-11-17 10:21:55 -0500: From: Guilherme guibuf...@gmail.com git add '' CDD/CDD_Diag.c When I experiment, git add '' seems to have the same effect as git add ., which is not surprsing. (i'm not the OP) it *is* very much surprising, at least if you're used to deal with quality command line interfaces. The problem is that you're invoking git-add with arguments whose effect is not specified. the problem is that the git-add command line does not specify its behavior fully. The solution is not to invoke git-add with a zero-character argument. no, that's a workaround. guibufolo: there are some live wires coming out of the wall here. worley: just don't touch them, that's the solution! -- roman -- 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.
Re: [git-users] On bash doing git add '' some-existing-file troubles
Hi, The problem here is not the LF to CRLF conversion i know where that comes from. The problem is that doing git add '' CDD/CDD_Diag.c results in a message about another file which was clearly not my intention to add. Cheers, Gui On Fri, Nov 14, 2014 at 8:26 PM, Philip Oakley philipoak...@iee.org wrote: - Original Message - From: G B To: git-users@googlegroups.com Sent: Friday, November 14, 2014 4:29 PM Subject: [git-users] On bash doing git add '' some-existing-file troubles Hello, I posted on Stackoverflow http://stackoverflow.com/questions/26933761/python-sh-module-and-git-try-to-add-more-files-then-in-command/26934517#26934517 a problem i was having with python sh. It turns out to be a problem with git add. When executing git add '' some-existing-file it sees the empty argument and tries to add a random(?) file. Is this by design or should i file a bug? Thank you. GB, you should inlcude all the information. It's likely to be a problem elsewhere. I've added a comment to the SO question regarding your need to ensure that the CRLF 'fatal:' warning you are getting is resolved. -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] File modified after git clone
I opened the modified file with a hexa viewer and the end of the lines are 0D0A ( CRLF ). In my project on the file .gitattributes is:*.java text *.scala text *.xml text *.properties text *.properties.default text *.sh text *.pig text *.py text *.md text PS: My file is a java source On 27 February 2013 00:24, Dale R. Worley wor...@alum.mit.edu wrote: From: José Guilherme Vanz guilherme@gmail.com For a better explanation. This modified file is shown like all its lines have been deleted and included again... That symptom means that the file formerly had LF line endings and was replaced by the version with CR-LF line endings (or vice-versa). Carefully extract both versions, and examine them with a program that shows you the line endings. Dale -- 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/groups/opt_out. -- Att. José Guilherme Vanz br.linkedin.com/pub/josé-guilherme-vanz/51/b27/58b/http://br.linkedin.com/pub/jos%C3%A9-guilherme-vanz/51/b27/58b/ http://blog.pt-br.libreoffice.org/ https://groups.google.com/d/forum/openqg -- 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/groups/opt_out.
[git-users] File modified after git clone
After clone a github repository in my PC, a file is showing like a modified file. But the last modification in this file was done 8 months ago. How is possible? I tried execute git checkout -- . but the file continues like a modified file. Anybody have a tip/solution for the problem? -- 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/groups/opt_out.
Re: [git-users] File modified after git clone
I'm using Ubuntu 12.10. For a better explanation. This modified file is shown like all its lines have been deleted and included again... On 26 February 2013 23:37, William Seiti Mizuta william.miz...@gmail.comwrote: What is your operating system? Maybe it is the EOL character. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Feb 26, 2013 at 11:31 PM, José Guilherme Vanz guilherme@gmail.com wrote: After clone a github repository in my PC, a file is showing like a modified file. But the last modification in this file was done 8 months ago. How is possible? I tried execute git checkout -- . but the file continues like a modified file. Anybody have a tip/solution for the problem? -- 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/groups/opt_out. -- 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/groups/opt_out. -- Att. José Guilherme Vanz br.linkedin.com/pub/josé-guilherme-vanz/51/b27/58b/http://br.linkedin.com/pub/jos%C3%A9-guilherme-vanz/51/b27/58b/ http://blog.pt-br.libreoffice.org/ https://groups.google.com/d/forum/openqg -- 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/groups/opt_out.
