git

If you work like me in a project with multiple developers and you want to enforce certain standards, this should be done as early as possible. Knowing that you don’t fulfill the linter rules on Jenkins is way too late. One way to enforce feedback are git hooks. Though, the fact that they are stored in .git makes them difficult to share in a project. Luckily, the git hooks plugin for git helps out....

If you try to merge huge branches with a lot of files (we had 900+), you might experience weird git behaviour, like “Bad Revision” messages, when you want to diff. In addition to that many files may appear to be kicked out from the git tree or even get removed physically. So merging was impossible. A good hint are the warnings at the end of the git merge stack trace....