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

small merge tool for temporary merges

From
MWMarc Weber <marco-oweber@gmx.de>
Date
Aug 3, 2008, 16:34 UTC
Message-ID
<20080803163415.GB14513@gmx.de>
Hi at all,
I'd like to announce the exisntance of my small git test merge tool.
After reading 
 Linux kernel mailing list may remember that Linus complained about such
 too frequent test merges when a subsystem maintainer asked to pull from
 a branch full of "useless merges"
in the man page of git-rerere I had to start it..
$ git clone git://mawercer.de/git-test-merge

============= ======================================================= small HOWTO:

$ alias gtm=git-test-merge
$ gtm h # show the help
$ gtm s mytestmerge branch{1,2} # define testmerge "mytestmerge" which is formed by merging branch1 and branch2
$ gtm u mytestmerge # merge first using octopus, if it fails merge with
                    # the previous merge result with next branch until
                    # no branches are left to merge

If the merge fails you can resolve the conflicts and run $ gtm c # you don't have to git-add the resolved files, will be done by the script

I hope its useful for you as well. If you have patches you may push them instantly. If it's obsolete because there is a better tool I appreciat you pointing me to it

Sincerly Marc Weber

Next: Petr Baudis
Message 1 of 3 in “small merge tool for temporary merges”
  1. Marc WeberAug 3, 2008
  2. Petr BaudisAug 3, 2008
  3. Jakub NarebskiAug 10, 2008

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.