git pull --rebase

[johnjbarton]

When run
cr update
I get a long error message from git about which branch should be used.

I guess you want
git pull --rebase origin master

[Jan Keromnes]

Thanks for reporting this! Fixed in 55e4c11