On Mon, 16 May 2011 01:32:25 +0000, Hongyi Zhao wrote:
> Hi all,
> Currently, I meet a the following problem:
> Suppose I have some folders with some files in each of them. Now, I
> copy all of these folders into another location and then make some
> changes, e.g., edit/remove/rename and so on, for some of the
> files/folders in the old and new location.
> After that, I want to merge them as one with all of the differences
> leave as they are, is this possiable?
Yes it is possible. One approach is to use something like unison
to do it. It will not allow you to merge files that you have changed in
These days there is a lot of interest in "Distributed Version Control"
which allows you to have multiple copies of sets of files, and pull (or
push) changes between them. The one I use most is mercurial (also known
as 'hg') http://mercurial.selenic.com/ which is simple to set up.
Probably the most famous is 'git', and probably the most interesting is