Git: rebasing workflow and resolving merge conflicts
Simple rebase/merge workflow and how to deal with possible merge conflicts.
More→clubmate.fi
About frontend web development
Blog of Hiljá Studio
Webdev Category
Git: move commits between branches with cherry-pick
Cherry-picking in Git is trivial, it's as easy and logical as it should be.
More→Git: checkout files or directories from another branch
You probably knew that a branch can be "checked out" with the `git checkout branch-name` command, but interestingly, a single file or a directory can also be subject to checkout.
More→Git: handy branching commands
Here's a little cheatsheet to help deal with branches.
More→Git: stashing
Stashing is a great tool to make life with branches a bit more fluent.
More→Tab complete Git commands and branches
Here's a quick post on the awesomeness of tab completion, and how it can be applied to Git commands and branch names.
More→Git: removing files from the staging area and the tree
How to remove stuff in Git.
More→Git: deleted a bunch of files accidentally from a repository, how to get them back?
You know the the horrible, sinking feeling, when you accidentally wiped out half of the repo with a harmless looking rm -rf. No worried though, you can get all back if it's a Git repo.
More→Bower and Gulp: match made in heaven (also)
This is kind of a sequel post to "Bower and Grunt: match made in heaven". With Gulp things are even more awesomer!
More→Git: dealing with branches, merging and rebasing
Here's how to make, delete, list, and use branches. Plus solutions to some hairy branching scenarios you might find yourself in.
More→Club-Mate, the beverage → club-mate.fi