From: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
To: "Dongsoo, Nathaniel Kim" <dongsoo.kim@gmail.com>
Cc: "Aguirre Rodriguez, Sergio Alberto" <saaguirre@ti.com>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
"Hiremath, Vaibhav" <hvaibhav@ti.com>,
"Toivonen Tuukka Olli Artturi" <tuukka.o.toivonen@nokia.com>,
"Koskipää Antti Jussi Petteri" <antti.koskipaa@nokia.com>,
"Cohen David Abraham" <david.cohen@nokia.com>,
"Alexey Klimov" <klimov.linux@gmail.com>
Subject: Re: OMAP3 ISP and camera drivers (update)
Date: Wed, 11 Mar 2009 18:14:07 +0200 [thread overview]
Message-ID: <49B7E34F.6070906@maxwell.research.nokia.com> (raw)
In-Reply-To: <5e9665e10903100308k7270db67w7947ee4b85eac120@mail.gmail.com>
Dongsoo, Nathaniel Kim wrote:
> Hi Sakari,
>
> I'm also having problem pulling your git now. I've pulled prior
> version of yours and this is second time of pulling your repository.
>
> Here you are a part of git diff message of mine after pulling your
> TUESDAY MARCH 10 version. Looks like all about indent thing.
>
> What should I do? If I want to pull your repository in my repository
> and merging automatically.
>
> I don't have any clue ;-(
This branch branch now contains linux-omap plus the updated patchset. So
the old patchset has been replaced by the new one. You're trying to pull
the new patchset on top of the old one and merging very likely fails
because of that.
--
Sakari Ailus
sakari.ailus@maxwell.research.nokia.com
next prev parent reply other threads:[~2009-03-11 16:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 15:32 OMAP3 ISP and camera drivers (update) Sakari Ailus
2009-03-08 23:36 ` DongSoo(Nathaniel) Kim
2009-03-09 10:18 ` Arun KS
2009-03-09 11:02 ` Dongsoo, Nathaniel Kim
2009-03-09 18:52 ` Aguirre Rodriguez, Sergio Alberto
2009-03-10 9:07 ` Sakari Ailus
2009-03-10 10:08 ` Dongsoo, Nathaniel Kim
2009-03-11 16:14 ` Sakari Ailus [this message]
2009-03-14 11:47 ` Mauro Carvalho Chehab
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=49B7E34F.6070906@maxwell.research.nokia.com \
--to=sakari.ailus@maxwell.research.nokia.com \
--cc=antti.koskipaa@nokia.com \
--cc=david.cohen@nokia.com \
--cc=dongsoo.kim@gmail.com \
--cc=hvaibhav@ti.com \
--cc=klimov.linux@gmail.com \
--cc=linux-media@vger.kernel.org \
--cc=saaguirre@ti.com \
--cc=tuukka.o.toivonen@nokia.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 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.