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

Re: Merge with git-pasky II.

From
FFFabian Franz <fabianfranz@gmx.de>
Date
Apr 26, 2005, 21:36 UTC
Message-ID
<200504262336.02583.FabianFranz@gmx.de>
In-Reply-To
<Pine.LNX.4.44.0504261400570.4678-100000@wax.eds.org>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Am Dienstag, 26. April 2005 23:28 schrieb Bram Cohen:
Show 8 quoted lines
> Now you've just gone off the deep end. This is an apples-to-apples
> comparison. Please accept one of thee following two statements:
>
> (a) Git doesn't do merging, and none of the related new tools around it do
> merging.
>
> (b) Codeville merge (sans rename functionality) would be superior for the
> merging which will be done.
I have one very humble question:
Why don't you write and contribute some code for git to do good merging?
This would resolve all your problems.

I think the "magic-merge" command is quite exchangable and if your way works good and is compatible, then people will automatically start using that.

cu
Fabian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFCbrRdI0lSH7CXz7MRAkS4AJ9JEka71M0Zc6cizXhrYpHiKHhL0gCcD/3Q j+UnPU/cXafGjGG6Bt9mZE8= =IYk0 -----END PGP SIGNATURE-----

Previous: Bram CohenNext: Linus Torvalds
Message 9 of 15 in “Re: Merge with git-pasky II.”
  1. Bram CohenApr 26, 2005
  2. Linus TorvaldsApr 26, 2005
  3. Tom LordApr 26, 2005
  4. Bram CohenApr 26, 2005
  5. Tom LordApr 26, 2005
  6. Linus TorvaldsApr 26, 2005
  7. Linus TorvaldsApr 26, 2005
  8. Bram CohenApr 26, 2005
  9. Fabian FranzApr 26, 2005
  10. Linus TorvaldsApr 26, 2005
  11. Linus TorvaldsApr 26, 2005
  12. Petr BaudisApr 28, 2005
  13. Diego CallejaApr 26, 2005
  14. Daniel BarkalowApr 26, 2005
  15. Tom LordApr 26, 2005

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.