I have to assume it’s a server mis-configuration. The message is originating from the GitHub server. So rest assured it has nothing to do with your git. For anyone who cares, here’s a good SO explanation for LD_PRELOAD: https://stackoverflow.com/a/426260/591166 Update: GitHub has apparently fixed the issue.
Nowadays the official git for windows is based at msys2 which seems to have tmux package at least. You can install g4w sdk as described here and then install tmux through pacman.
I prefer using submodules over Nuget packages for frequently changing internal libraries. Here’s why: Merging: If several developers make changes to the same library at the same time, with submodules, these changes can be merged. With Nuget packages, obviously there’s no concept of merging. Less wait: With submodules, you push, and then pull with whatever … Read more
edit: @wiswit has pointed to this good explanation. f2e4113 and d4b9bfc are file-indexes. With git show f2e4113 you see the file before the commit and git show d4b9bfc shows the file after the commit. The combined diff format is in the git diff manual pages described. COMBINED DIFF FORMAT Any diff-generating command can take the … Read more
I was going to write an answer of my own, but then I found this great answer (and a great question). It does not give you a single way to do things, but upon a careful reading, you should be able to find a workflow that suits your situation.
GitHub keeps track of forks made through their interface and assumes pull requests will be for that original repository. You need to tell GitHub that your copy is not a fork but rather a regular repository that just happens to have identical history. Sadly, GitHub doesn’t offer a good way to just uncheck the fork … Read more
I had the same problem, and in my case it seems to be due to the initial subtree commit being merge-squashed into the master branch. Looking through the subtree source I found this: https://github.com/git/git/blob/master/contrib/subtree/git-subtree.sh#L224 It looks like subtree greps your git log for git-subtree-dir: foo but doesn’t find a suitable commit. Try git log –grep=”git-subtree-dir: … Read more
$ git checkout foo -b $ git branch –track origin/retarget The first two commands instruct git to: create a local branch named “origin/retarget” (very bad idea, as it is named as a remote tracking branch”, while it is actually a simple local branch with a ‘/‘ in its name) starting from the current branch (“foo“, … Read more
The easiest thing to do would be to diff the results of your conflict resolution with a merge that auto-resolves conflicts without human intervention. Any automatic resolutions will be ignored, since they will be resolved in exactly the same way. I see two ways of visualizing the possible “evil” resolutions. If you are making this … Read more