MCPcopy Index your code
hub / github.com/driusan/dgit / checkMergeAndUpdate

Function checkMergeAndUpdate

git/readtree.go:655–914  ·  view source on GitHub ↗

Check if the merge would overwrite any modified files and return an error if so (unless --reset), then update the file system.

(c *Client, opt ReadTreeOptions, origidx map[IndexPath]*IndexEntry, newidx *Index, resetremovals []File)

Source from the content-addressed store, hash-verified

source not stored for this graph (policy: none)

Callers 3

ReadTreeThreeWayFunction · 0.85
ReadTreeFastForwardFunction · 0.85
ReadTreeFunction · 0.85

Calls 15

parseSparsePatternsFunction · 0.85
checkSparseMatchesFunction · 0.85
FileTypeAlias · 0.85
CheckoutIndexUncommitedFunction · 0.85
removeFileCleanFunction · 0.85
SkipWorktreeMethod · 0.80
HasPrefixMethod · 0.80
FilePathMethod · 0.80
IsDirMethod · 0.80
StageMethod · 0.80
IsCleanMethod · 0.80
GetMapMethod · 0.80

Tested by

no test coverage detected