rebase-and-merge-2 Hot-fix on both branches My first commit My second commit Non production ready Hot fix Another non production One from Sara that breaks everything Sara just fixed everything! let's deploy