Resume your Work with Git
Learn some protip on how to get back to work after a long weekend.
3 min read
3 min read
I (mostly) always create a new branch when working on something. The branch is usually just my personal one without anyone else interacting with it. This fact is important as it allows me to change it, rebase it, modify it’s commits and “force push” it back up to the origin branch. Without any fear of messing up with any of my colleagues. Such a branch should also only have a single responsibility, in the sense that it only contains things that matter for that feature/bugfix/refactoring whatever. If a work mate passes by and asks me to fix something that’s totally unrelated, then I’ll jump over to master & create a new separate one (or directly commit as per rule mentioned before).
But enough for that.
What do I mean by “resuming work”? Think about the following: you’re working on a feature on Thursday and Friday and you’re not done yet. You push up your branch to the remote repository as usual (just to have a backup copy online in case your computer blows up) 😉.
$ git commit -am 'feat: allow user to save list filters' $ git push
With that you’re done and ready for the weekend.
On Monday you come back open your code edito…and well…what was I doing again again on Friday 🤔. Happens to you as well? I’m glad 😃. What I usually do then is to…
$ git reset HEAD~
..on the branch I’m currently working. With that command, the last commit on the branch (the one I made before leaving into the weekend) will be removed again and all files and moved back to the staging area. Thus with
git status you again see all the files I modified the week before and helps me resume it with ease. Note! This should only be done if the branch is a non-shared one, as you’re actively modifying the history of that branch.
As you can see, there’s no need to learn all the Git magic. Just some simple commands can already improve your Git workflow a lot. Over the years I’ve worked with different teams and a lot of developers struggle with Git (although it has been around for more than a decade). As such I recorded a video course that collects a series of git commands that’ll directly help you with your daily development tasks: https://egghead.io/courses/productive-git-for-developers