Skip to content

Bits'n'Bites

Learning things, bit by bit…

Category: Git

A stable mainline branching model for Git

In this article I will describe a Git workflow and branching model that I have used successfully in several projects and companies for many years now. It scales from small to large teams, and it fixes some common problems with Continuous Integration and GitFlow, for instance. Moreover, it is very simple and results in a nice Git …

Read More
Marcus GeelnardDecember 27, 2016December 28, 2016

GitHub pull request != code review

This article tries to summarize some of the problems that I have come across when trying to use GitHub pull requests for doing code reviews. In summary: It was not all pleasant, and by the way I apologize for this rather harsh rant. The (single) good thing first The one thing that GitHub gets right …

Read More
Marcus GeelnardJanuary 12, 2016November 16, 2016

Git history: work log vs recipe

This is a follow-up article to A tidy, linear Git history, going into more details of why I think that rewriting your Git commit history (i.e. rebasing) is usually the right thing to do. Two different history models When it comes to Git history (or any other version control system history, for that matter), there …

Read More
Marcus GeelnardJanuary 1, 2016November 16, 2016

A tidy, linear Git history

One of the things that is overlooked in many Git based projects is the value of a linear commit history. In fact, many tools and guidelines discourage Git workflows that aim for a linear history. I find this sad, since a tidy history is very valuable, and there is a straight forward workflow that ensures …

Read More
Marcus GeelnardDecember 23, 2015November 16, 2016

Recent Posts

  • Installing Intel/Altera Quartus Prime in Ubuntu 17.10
  • Benchmarking OS primitives
  • Faster C++ builds
  • A stable mainline branching model for Git
  • GitHub pull request != code review

Categories

  • Audio (7)
  • Benchmarking (1)
  • Compression (3)
  • Git (4)
  • Hardware Development (1)
  • JavaScript (12)
  • Mobile (1)
  • Software Development (6)
  • WebGL (3)

Hosted Projects

  • CrunchMe
  • JavaScript synth
  • liblzg
  • Sonant Live
  • SoundBox
  • SubShifter
  • TinyThread++

Follow us on Twitter

Follow @twitter
Copyright ©2011-2016, bitsnbites.eu