knotserver: calculate old/new SHAs in merge #20

open opened by

oppi.li 3 days ago targeting master from op/lqvzlsltozms

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/3mki6u6e7wq22

+1 -1

2 changed files

Interdiff #0 → #1

expand all

knotserver

git

git.go

xrpc

merge.go

knotserver/xrpc/merge.go

This file has not been changed.

+1 -1

knotserver/git/git.go

··· 82 82 83 83 // re-open a repository and update references 84 84 func (g *GitRepo) Refresh() error { 85 - refreshed, err := PlainOpen(g.path) 85 + refreshed, err := Open(g.path, g.Hash().String()) 86 86 if err != nil { 87 87 return err 88 88 }

History

2 rounds 0 comments

oppi.li submitted #1 3d

diff

1 commit

expand

c50c21c8

knotserver: calculate old/new SHAs in merge

merge conflicts detected

expand

knotserver/git/git.go:82
knotserver/xrpc/merge.go:110

expand 0 comments

oppi.li submitted #0 3d

diff

1 commit

expand

cbbb23b7

knotserver: calculate old/new SHAs in merge

expand 0 comments

Configure Feed

Configure Feed

History