Skip to content
Entropy Wins
A blog on Software Architecture, Design and Craftsmanship
  • Clean Code
  • Craftsmanship
  • Architecture
  • Testing
  • PHP
  • Open Source
  • MediaWiki
  • Jeroen De Dauw
  • MediaWiki Hosting
  • Professional.Wiki
  • Follow me on Twitter
  • Follow me on GitHub
  • Follow me on DEV
  • RSS
  • Atom
  • Privacy Policy

Tag: Gerrit

Resolving a merge conflict on gerrit

2013-07-01 Jeroen 4 Comments

In this post I describe the solution I use to a common situation for people using gerrit. In other words,…

Continue Reading →

Posted in: Programming Filed under: Gerrit, Git

Start your wiki today

Try out ProWiki for free. Managed MediaWiki hosting with one-click install and admin panel. Create your wiki today.

Newsletter

Sign up below to receive news on my upcoming Clean Architecture book, including a discount:

Recent Posts

  • Simplify and Delete
  • Advice for junior developers
  • Using PSR-3 Monolog in MediaWiki
  • Value Objects with PHP 8.1
  • New MediaWiki blog
  • Applications as Frameworks
  • Readable Functions: Guard Clause
  • My year in books
  • Readable Functions: Do One Thing
  • PHP Typed Properties

Archives

  • August 2024
  • September 2022
  • February 2022
  • January 2022
  • October 2019
  • February 2019
  • January 2019
  • October 2018
  • September 2018
  • August 2018
  • May 2018
  • February 2018
  • January 2018
  • October 2017
  • September 2017
  • June 2017
  • May 2017
  • April 2017
  • February 2017
  • January 2017
  • December 2016
  • November 2016
  • October 2016
  • September 2016
  • August 2016
  • July 2016
  • June 2016
  • May 2016
  • April 2016
  • March 2016
  • February 2016
  • January 2016
  • December 2015
  • November 2015
  • October 2015
  • September 2015
  • August 2015
  • June 2015
  • February 2015
  • September 2014
  • August 2014
  • July 2014
  • May 2014
  • April 2014
  • March 2014
  • February 2014
  • January 2014
  • December 2013
  • November 2013
  • October 2013
  • September 2013
  • July 2013
  • June 2013
  • March 2012
  • December 2011
  • November 2011
  • September 2011
  • August 2011
  • July 2011
  • June 2011
  • May 2011
  • February 2011
  • January 2011
  • December 2010
  • October 2010
  • August 2010
  • July 2010
  • June 2010
  • May 2010
  • April 2010
  • March 2010
  • February 2010
  • January 2010
  • December 2009
  • November 2009
  • October 2009
  • September 2009
  • August 2009
  • July 2009
  • June 2009
  • May 2009
  • April 2009
Copyright © 2009-2020 Jeroen De Dauw