git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: merging unmanaged working tree

From
DDaniel <mjucde@o2.pl>
Date
Mar 15, 2010, 12:34 UTC
Message-ID
<46a29168.6d880e7c.4b9e296c.483a1@o2.pl>
In-Reply-To
<87ljdtkedl.fsf@dasa3.iem.pw.edu.pl>
Show 16 quoted lines
> 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
Previous: Łukasz StelmachNext: Łukasz Stelmach
Message 2 of 9 in “merging unmanaged working tree”
  1. Łukasz StelmachMar 15, 2010
  2. DanielMar 15, 2010
  3. Łukasz StelmachMar 15, 2010
  4. Avery PennarunMar 15, 2010
  5. Łukasz StelmachMar 15, 2010
  6. Avery PennarunMar 15, 2010
  7. Chris PackhamMar 15, 2010
  8. Avery PennarunMar 15, 2010
  9. Łukasz StelmachMar 15, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.