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 […]
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’.