Recover a lost branch without losing your marbles

So, dilemma time. Your client sends you a list of changes. Somewhere in that list is the innocuous sounding, ‘style account section’. You leave it till last in the knowledge that the account section is already complete and possibly needs a few tweaks after the new button style you have introduced. Holy moly, it’s completely […]

Understanding the Git Rebase argument

The major hurdle I had in trying to understand the merge vs rebase argument was that it is not immediately apparent that the git pull command is actually a shorthand for two separate commands, ‘git fetch’ and ‘git merge’.

Keeping local Magento extensions under version control

Use Case: You are developing local extensions for a Magento project and you wish to keep them in their own repository for use in later projects without disrupting your regular workflow.