t1c.dev / core
Monorepo for Tangled
Star
Fork 0
Watch

knotserver/git: rework merge check to also use `git am` master

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>

Author oppiliappan Committer Tangled Date Commit 86081872 Parent 0fd947f3 Change ID vvkmkwkr
+37 -31
2 changed files