From: Denis Kenzior <denkenz@gmail.com>
To: ofono@ofono.org
Subject: Re: [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support
Date: Tue, 04 Jan 2011 17:06:36 -0600 [thread overview]
Message-ID: <4D23A7FC.7050305@gmail.com> (raw)
In-Reply-To: <1294182050-5526-1-git-send-email-lei.2.yu@nokia.com>
[-- Attachment #1: Type: text/plain, Size: 991 bytes --]
Hi Lei,
On 01/04/2011 05:00 PM, Lei Yu wrote:
> ---
> Makefile.am | 3 +-
> include/cdma-sms.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 69 insertions(+), 1 deletions(-)
> create mode 100644 include/cdma-sms.h
>
Still doesn't apply:
denkenz(a)ubuntu:~/ofono-master$ git am --3way ~/merge/\[PATCH\ v2\,\
2_7\]\ cdma-sms\:\ Add\ CDMA\ SMS\ Support.eml
Applying: cdma-sms: Add CDMA SMS Support
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging Makefile.am
CONFLICT (content): Merge conflict in Makefile.am
Failed to merge in the changes.
Patch failed at 0001 cdma-sms: Add CDMA SMS Support
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".
Have you rebased to the latest git?
Regards,
-Denis
next prev parent reply other threads:[~2011-01-04 23:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 23:00 [PATCH v3 2/7] cdma-sms: Add CDMA SMS Support Lei Yu
2011-01-04 23:06 ` Denis Kenzior [this message]
2011-01-05 16:22 ` Lei Yu
2011-01-05 16:38 ` Denis Kenzior
2011-01-05 19:17 ` Rajesh.Nagaiah
2011-01-06 16:58 ` Lei Yu
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=4D23A7FC.7050305@gmail.com \
--to=denkenz@gmail.com \
--cc=ofono@ofono.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox