[spolu]

Yep rebasing is a good idea, but it's a little complicated I find for being part of an "ubiquitous" process within a team