With git, it’s possible to do things that must be considered pure magic for anyone using older version control systems. Learn 7 simple tricks that will help you take the leap beyond commit, push and pull and let you leverage the powers of git. With these 7 tricks, you will be the git Wizard of… Continue reading Become a Git Wizard with 7 Simple Tricks
Tag: git
Fixing a Pull Request from Master
So you created an awesome pull request with a couple of features, but the evil(?) maintainer (could be me) just denied it and said you shouldn’t make pull requests from master? Then you’ve come to the right place to learn what went wrong and how to fix it. Current (Incorrect) State Looking at the history… Continue reading Fixing a Pull Request from Master
Getting a Pull Request Accepted
I like to receive pull requests, but I like some more than others. Here are a few hints on how to make me love your totally awesome pull request and merge it instantly. With a bit more than a year as an open source maintainer I’ve received a few pull requests. Some have been good,… Continue reading Getting a Pull Request Accepted
Partial Commits with Git
Warning: WP_Syntax::substituteToken(): Argument #1 ($match) must be passed by reference, value given in /var/www/abel.nu/coding.abel.nu/wp-content/plugins/wp-syntax/wp-syntax.php on line 380
Every once in a while I’m working on a feature, only to discover that I need to extend another part of the code first. If I was disciplined, I would create another branch at that point. But I’m not. I end up with both the extended utility class and the actual feature as pending changes.… Continue reading Partial Commits with Git
Git Branch Clean-up Adventures
Git is magic, but sometimes it drives my crazy with all that power causing strange situations and clean-up work. The magic of git is that it is (nearly?) always possible to clean up the mess and get back to a good state. The problem is that there are A LOT of commands to master. This… Continue reading Git Branch Clean-up Adventures