Actually, wouldn't this also be true about a merge too? When you merge your branch (instead of rebasing it) your set of changes are inserted into a different context given by the top of the branch you merge into. You still need to asses whether your set of changes (in your feature branch) that are now part of the merged commit are still consistent with your intended fix. (a merge and a rebase both could change the context of the set of changes you introduced).
Recently came across an issue where xdebug on the CLI stopped working. Eventually after enough tinkering I found that the maximum simultaneous connections needs to be set to 2 or higher. Turns out one of the later versions of Drush (probably my upgrade to Drush 8) uses a subcommand which creates another connection. See https://github.com/drush-ops/drush/issues/1534
On many teams replacing / force pushing the main branch is a recipe for further drama and issues. It isn't practical for everyone.
Additionally, tests detecting this will only help you if your tests aren't in the same repo.. usually in TDD someone will write tests and code in the same branch and once it's merged they think "Oh, I'm done".
This isn't the case if someone else's mistaken merge comes in and removes both their test changes and their tests at once - test suite won't find that.
Another step one can take is to add the following to yours settings.php (after you have added your developers to the apache group):
The sticky bits are very important, because otherwise, permissions won't be recursive in the proper way.
Thank you again for the excellent article.
Actually, wouldn't this also be true about a merge too? When you merge your branch (instead of rebasing it) your set of changes are inserted into a different context given by the top of the branch you merge into. You still need to asses whether your set of changes (in your feature branch) that are now part of the merged commit are still consistent with your intended fix. (a merge and a rebase both could change the context of the set of changes you introduced).
And it seems that
git config --global branch.autosetuprebase always
is now (since v1.7.9)
git config --global pull.rebase true
(from https://news.ycombinator.com/item?id=11144061)
Recently came across an issue where xdebug on the CLI stopped working. Eventually after enough tinkering I found that the maximum simultaneous connections needs to be set to 2 or higher. Turns out one of the later versions of Drush (probably my upgrade to Drush 8) uses a subcommand which creates another connection. See https://github.com/drush-ops/drush/issues/1534
On many teams replacing / force pushing the main branch is a recipe for further drama and issues. It isn't practical for everyone.
Additionally, tests detecting this will only help you if your tests aren't in the same repo.. usually in TDD someone will write tests and code in the same branch and once it's merged they think "Oh, I'm done".
This isn't the case if someone else's mistaken merge comes in and removes both their test changes and their tests at once - test suite won't find that.