build-lily: print version of the script
build-lily: list untracked files
build-lily: more info when merge fails.
build-lily: misc style
build-lily: rebase merged branches.

the idea is that when some branches are merged into the commit that is
being built, they should be rebased so that they don't contail unwanted
additional commits.