From: Michael J Gruber <drmicha@warpmail.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: Rebase pain on (the) pot
Date: Thu, 19 Mar 2015 15:31:47 +0100 [thread overview]
Message-ID: <550ADDD3.9070706@warpmail.net> (raw)
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 reply other threads:[~2015-03-19 14:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 14:31 Michael J Gruber [this message]
2015-03-19 19:43 ` Rebase pain on (the) pot Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=550ADDD3.9070706@warpmail.net \
--to=drmicha@warpmail.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.