On Sat, Jul 23, 2022 at 11:28:50AM +0200, Omar Polo wrote:
> yes, it seems a good idea

I am getting a conflict when I try to apply this patch:

$ got patch /tmp/p
G  got/got.c
G  include/got_worktree.h
C  lib/worktree.c
G  regress/cmdline/common.sh
G  regress/cmdline/histedit.sh
C  regress/cmdline/rebase.sh
got: patch failed to apply

The patch seems to be based on a commit I don't have:

> diff 89771dc50558f0fd902ecabecdc57e448bf7ab92 531381f27882dbe3fc1542c2b9c52a84f76aa3e1
> commit - 89771dc50558f0fd902ecabecdc57e448bf7ab92
> commit + 531381f27882dbe3fc1542c2b9c52a84f76aa3e1

$ got up -c 89771dc50558f0fd902ecabecdc57e448bf7ab92
got: commit 89771dc50558f0fd902ecabecdc57e448bf7ab92: object not found

$ got info | grep commit
work tree base commit: 65858f9a993c163be8f4af482e7b400535d61d17