From: James Cook <falsifian@falsifian.org>
Subject: Re: Should merge (and rebase) allow modified files when fast-forwarding?
To: gameoftrees@openbsd.org
Date: Thu, 8 Jun 2023 13:24:19 +0000

> > o [main] Another commit
> > |
> > o [br] A commit

> Given this, the only commands which would need to worry about tree conflicts
> involving local work tree state are 'got update', 'got patch',
> 'got cherrypick', 'got backout', and 'got unstage'.
> Other commands should require a clean work tree as their starting point.

Okay, that is sensible. Thanks for the explanation.

Note that there is currently a case where "got rebase" also does not
require a clean work tree: when it prints "X is already based on Y" it
then proceeds to behave like got update.

-- 
James