Tobias Becker
Tobias Becker
The same for me even multiple times for that specific merge, number 4 or 5 then has a real conflict. Unfortunately the commits are too big and too proprietary to...
Sorry for the late reply, I was on vacation. Just to see if I applied to the correct change: ```sh > which git-imerge /home/linuxbrew/.linuxbrew/bin/git-imerge > readlink -f /home/linuxbrew/.linuxbrew/bin/git-imerge /home/linuxbrew/.linuxbrew/Cellar/git-imerge/1.2.0/libexec/bin/git-imerge >...
After I [deleted](https://stackoverflow.com/a/21635422/581002) everything that `rerere` had recorded I arrive this behavior ```sh > rm -rf .git/rr-cache > git imerge rebase master Attempting automerge of 6-7...failure. Attempting automerge of 1-1...success....
I find at least one other `git merge` call where it possibly should also be set, namely in ```python def manualmerge(self, commit, msg): """Initiate a merge of commit into the...
Hi @dajuric. That's the thing @spoiledtechie is talking about. I have the same problem. I tried your `DotImaging.IO` library for easy video loading. And easy it is indeed, I really...
@zabulus: I already tried [this tool](https://brutaldev.com/post/NET-Assembly-Strong-Name-Signer) as a manual build step. This kind of works, but I'd rather have the original authors signature for his own code, like it's meant...
Hi. I'm sorry but I don't have the state of that project anymore. In case I experience such behavior again, I'll document everything.
I also get this exception and was able to reproduce it. You can see it happening repeatedly in this [video][] (sorry for the bad quality). It is triggered by typing...
In my work I have to restart the kernel about 30 times a day and it's plain annoying to always have to do that click. But otherwise it won't find...
Yes that's true of course. Anyway, I'd rather have the I know what I'm doing mode. 😎