July 20, 2013
Proceeding with my sequence of posts about version control systems, I’ll explain my Git workflow. It’s quite simple, after set up, the day to day workflow is as follows:
get the latest information from remote server: git pull --ff-only create a new branch and switch to it: git checkout -b branch_name work, work, work, then commit: git commit go back to master: git checkout master check if there’s something new: git pull --ff-only merge my work back into master: git rebase branch_name upload the modifications to server: git push And since I reached the magic number seven, those are the seven steps.