dvcs partial merge (git, hg merge tracking)
问题 I've one question about general DVCS, including Git and Hg. In both Git and Hg merge tracking is done at the "commit" level instead of the "file/directory" level. One of the "side effects" is that you can't easily do a "partial merge": You've modified 30 files in your branch "feature_branch_x" You want to merge ONLY the files under (let's say) /kernel/gui With "item based merge tracking" (Perforce, ClearCase, Plastic SCM <= 3.0) you can just select a few files to merge, then checkin, then