From: Daniel <mjucde@o2.pl>
Date: Mon, 15 Mar 2010 12:34:52 GMT
Subject: Re: merging unmanaged working tree
Message-ID: <46a29168.6d880e7c.4b9e296c.483a1@o2.pl>
In-Reply-To: <87ljdtkedl.fsf@dasa3.iem.pw.edu.pl>

> Hello.
> 
> Is there a method to (dry?) run git-merge to detect conflicts
> on:
> 
> * current HEAD (or working tree)
> * selected previous revision (the one used to "branch")
> * directory tree (or a single file) "branched" with git-archive
> 
> I'd like to synchronize portable working tree but don't want to keep
> history in it.
> 
> -- 
> Miłego dnia,
> Łukasz Stelmach
> --

Does "git-merge --squash" do what you want? You still need to have
the other tree managed by git (even for a while).

-- 
Daniel