From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Subject: Re: make 'got update' skip conflicted files?
To: Stefan Sperling <stsp@stsp.name>
Cc: gameoftrees@openbsd.org
Date: Sat, 18 Apr 2020 06:31:26 -0600

On Sat, 18 Apr 2020 14:29:50 +0200, Stefan Sperling wrote:

> Of course. Though such a list could potentially grow very long, too.

True.

> In Subversion the final lines contain a report on the number of conflicted
> and skipped files found during an update. And this report is omitted if no
> such issues were encountered. Perhaps that is better?

Yes, I think that is a better solution.  The user can always run
"got stat" to find which files are in conflict.

 - todd