On Wed, Dec 15, 2010 at 08:00:08AM +0000, Chunlin Zhang wrote: > The only way now I know is to replace the file with the version file I want in > working copy,and then git add and git commit.I think it is inconvenient. > > Then I think if there is some command to select local or remote version file to > add more easier,because it is obviously git keep 2 version file. IIRC, git checkout --theirs -- <file> git add <file> -Ilari -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html