From: Rogan Dawes <lists@dawes.za.net>
To: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Merge, rebase and whitespace fixes
Date: Mon, 29 Jun 2009 23:30:47 +0200 [thread overview]
Message-ID: <4A493287.20106@dawes.za.net> (raw)
In-Reply-To: <cb7bb73a0906291218m3ba43109s35cad87efc5161a7@mail.gmail.com>
Giuseppe Bilotta wrote:
> Hello all,
>
> recently a tree I've been working on received some thorough whitespace
> adjustments (changing indents from spaces to tabs). This results in
> annoying conflicts when running merges or rebases with my local
> branches. I tried googling around but I couldn't find any helpful
> hints on how to make git cope with this. Any suggestions?
>
Do the same thing to your own tree?
next prev parent reply other threads:[~2009-06-29 21:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-29 19:18 Merge, rebase and whitespace fixes Giuseppe Bilotta
2009-06-29 21:30 ` Rogan Dawes [this message]
2009-06-30 7:37 ` Giuseppe Bilotta
2009-06-30 9:03 ` Rogan Dawes
2009-06-30 9:18 ` Giuseppe Bilotta
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=4A493287.20106@dawes.za.net \
--to=lists@dawes.za.net \
--cc=git@vger.kernel.org \
--cc=giuseppe.bilotta@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).