- when merging use --no-ff (no fast forward)
- you can think of xstage as master, whatever you merge to master you will merge
  to xstage, so double the work, but this way we have xstage exclusively for
  testing