Re: VCS comparison table
- From
Jeff King <peff@peff.net>
- Date
- Oct 26, 2006, 21:25 UTC
- Message-ID
- <20061026212531.GB15941@coredump.intra.peff.net>
- In-Reply-To
- <4540A1FE.4050300@ableton.com>
On Thu, Oct 26, 2006 at 01:54:38PM +0200, Nicholas Allen wrote:
Show 6 quoted lines
> I would have thought that supports renames would also involve flagging a > conflict when merging a file that has been renamed on 2 separate > branches. ie 2 branches rename the file to different names and then one > branch is merged into the other. In this situation, the user should be > told of a rename conflict. Bzr supports this as far as I know. Not sure > about git though as I have never used it.
It works as you expect:
$ git-init-db $ touch foo $ git-add foo $ git-commit -m foo Committing initial tree 4d5fcadc293a348e88f777dc0920f11e7d71441c $ git-checkout -b other $ git-mv foo bar $ git-commit -m bar $ git-checkout master $ git-mv foo baz $ git-commit -m baz$a $ git-pull . other Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with 5a1dfd32c56a24d0ef06f0e71d731fcd49d5dc6e Merging: 76ac76ee3ce890d43648ebc009d278dc81a327e0 baz 5a1dfd32c56a24d0ef06f0e71d731fcd49d5dc6e bar found 1 common ancestor(s): c9e7e95de6fdbb2af06ea44cc60d1ac1a63eaad6 foo CONFLICT (rename/rename): Rename foo->baz in branch HEAD rename foo->bar in 5a1dfd32c56a24d0ef06f0e71d731fcd49d5dc6e Automatic merge failed; fix conflicts and then commit the result.