emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Ihor Radchenko <yantar92@posteo.net>
To: Shynur Xie <one.last.kiss@outlook.com>
Cc: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] Several typo fixes
Date: Thu, 06 Jul 2023 10:01:01 +0000	[thread overview]
Message-ID: <87o7kp740y.fsf@localhost> (raw)
In-Reply-To: <PH0PR11MB74708B1CDAAFF89CDA1CBF05D72FA@PH0PR11MB7470.namprd11.prod.outlook.com>

Shynur Xie <one.last.kiss@outlook.com> writes:

> From 34d8d8a4a532eea67e485347a690781674ee3f09 Mon Sep 17 00:00:00 2001
> From: Shynur <one.last.kiss@outlook.com>
> Date: Wed, 5 Jul 2023 22:23:44 +0800
> Subject: [PATCH] Several typo fixes

Thanks, but the patch does not apply onto the latest WORG master:

    128 git … am --3way -- /tmp/0001-Several-typo-fixes.patch
    Applying: Several typo fixes
    error: sha1 information is lacking or useless (CONTRIBUTE.org).
    error: could not build fake ancestor
    Patch failed at 0001 Several typo fixes
    hint: Use 'git am --show-current-patch=diff' to see the failed patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".

May you please rebase the patch onto the latest master?

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>


  reply	other threads:[~2023-07-06 10:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-05 14:29 [PATCH] Several typo fixes Shynur Xie
2023-07-06 10:01 ` Ihor Radchenko [this message]
2023-07-06 17:34   ` Shynur Xie
2023-07-06 17:41     ` Ihor Radchenko

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

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87o7kp740y.fsf@localhost \
    --to=yantar92@posteo.net \
    --cc=emacs-orgmode@gnu.org \
    --cc=one.last.kiss@outlook.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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).