DMD build
Martin Nowak
dawg at dawgfoto.de
Sun Dec 30 15:34:27 PST 2012
> I would expect rebasing to fix it trivially so long as git mv was used rather
> than renaming the file with the OS' commands, but I don't know for sure.
>
> - Jonathan M Davis
>
Git doesn't record renamings but uses a heuristic check for similarity
instead. Rebasing will be trivial as long as the rename detection
succeeds. Once the '.cc' files differ too much from the '.c' base in an
open pull request it'll cause a delete/modify conflict.
http://stackoverflow.com/questions/2314437/resolve-conflict-delete-modify-in-git
More information about the Digitalmars-d
mailing list