tangled.org / core
Monorepo for Tangled tangled.org
812
fork

Configure Feed

Select the types of activity you want to include in your feed.

knotserver/git: rework merge check to also use git am #102

open opened by
oppi.li targeting master from op/rlrsyllrmmrk

we were using git apply in merge check and git am for the actual merge, but in reality, there are slight behavior changes among the two. this change switches out git apply in mergeCheck to use git am when dealing with mailbox style patches.

Signed-off-by: oppiliappan me@oppi.li

Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:qfpnj4og54vl56wngdriaxug/sh.tangled.repo.pull/3mdifrzrs2722
Diff #0

No differences found between the selected revisions.

History

1 round 0 comments
sign up or login to add to the discussion
oppi.li submitted #0
patch application failed: error: No valid patches in input (allow with "--allow-empty")
expand 0 comments