Linus Torvalds 02ede67ad4 git-read-tree: be a lot more careful about merging dirty trees ...

We don't want to overwrite state that we haven't committed yet
when merging, so it's better to make git-read-tree fail than
end up with a merge tree that ends up not having the dirty changes.

Update git-resolve-script to fail cleanly when git-read-tree fails.

2005-06-05 20:02:31 -07:00

1.6 KiB

Raw Blame History

View Raw