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

Rebase pain on (the) pot

From
MGMichael J Gruber <drmicha@warpmail.net>
Date
Mar 19, 2015, 14:31 UTC
Message-ID
<550ADDD3.9070706@warpmail.net>
Do we have a merge driver or something for the l10n files?

I'm trying to rebase an older branch on top of origin/next. My topic branch has changes to git.pot (the old glossary command idea), and rebasing produces a lot of conflicts due to simple line number changes in the comments. (The de.po in the next commit to be rebased won't fair any better, probably.)

Michael
Next: Junio C Hamano
Message 1 of 2 in “Rebase pain on (the) pot”
  1. Michael J GruberMar 19, 2015
  2. Junio C HamanoMar 19, 2015

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.