Hi Tomas, Tomas Volf <~@wolfsden.cz> writes:
> Hi, > > so, in guix repository we include ../etc/git/gitconfig in the > .git/config. I get the motivation for that, but I wanted to raise a > down side that I encountered today. I have fetched the upstream Guix > and went on to merge the updates, but got a merge conflict, in the > etc/git/gitconfig file. > > That turned out to be somewhat unpleasant. Magit stopped working. Git > command line stopped working: > > --8<---------------cut here---------------start------------->8--- > $ git status > fatal: bad config line 10 in file .git/../etc/git/gitconfig > --8<---------------cut here---------------end--------------->8--- > > Once you realize what went wrong, it is not *that* hard to fix, but it > still was somewhat unpleasant surprise. What went wrong? Could you give in more details how you got into such a situation? I did change the value of format.useAutoBase in 958bc01404 yesterday, it seems it triggered that for you? But I do not understand how. -- Thanks, Maxim
