Group items tagged

Not a particularly useful post I admit, but this was the first time I was interested in merging in a single commit from a remote repo rather than an entire branch. The git command 'cherry-pick' does just that.

This is a good read after looking at the previous Git flow.

Basically, with git, every merge is a conflict, which leaves you with an index that contains three versions of each file, the versions from each branch and the base. On this index, various resolvers are run, which can decide for each individual file how to resolve the matter.

This is an awesome tool I saw at the Evergreen conference. I used it on the Merlin git repo which was cool to see but since everything is in a flat directory structure and it's mostly Jessica (and a little bit me) committing it's not nearly as cool as some of the videos from other projects.

I love the idea of automatically pushing to production after a new commit is made to master.