From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: jp2a: update to 1.1.1
Date: Thu, 26 May 2022 16:43:25 +0200 [thread overview]
Message-ID: <20220526144325.4SicMxRx4IeZn8lig5rn8dPjQJGft5v80GoCXfTdG5g@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36508@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 830 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138654330
Comment:
> > rebase your branch on top of master
> ```
> ... <thousands upon thousands of merge conflicts>
> CONFLICT (add/add): Merge conflict in xbps-src
> error: could not apply cf536a16a3... jp2a: update to 1.1.1
> hint: Resolve all conflicts manually, mark them as resolved with
> hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
> hint: You can instead skip this commit: run "git rebase --skip".
> hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
> ```
you didn't rebase on top of this repository's master then, did you run something like `git fetch upstream; git rebase upstream/master` or `git pull --rebase upstrean/master`?
next prev parent reply other threads:[~2022-05-26 14:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 18:38 [PR PATCH] jp2a: update to 1.1.1, adopt subnut
2022-04-14 9:01 ` wael444
2022-04-14 9:13 ` paper42
2022-04-14 10:50 ` wael444
2022-04-19 17:18 ` [PR REVIEW] " leahneukirchen
2022-04-19 19:01 ` paper42
2022-04-20 2:34 ` [PR PATCH] [Updated] " subnut
2022-04-25 14:48 ` [PR REVIEW] " paper42
2022-04-25 16:31 ` [PR PATCH] [Updated] " subnut
2022-05-26 14:07 ` jp2a: update to 1.1.1 wael444
2022-05-26 14:12 ` wael444
2022-05-26 14:25 ` wael444
2022-05-26 14:43 ` paper42 [this message]
2022-05-26 14:47 ` wael444
2022-05-26 17:14 ` subnut
2022-05-26 17:20 ` wael444
2022-05-26 20:45 ` [PR PATCH] [Merged]: " leahneukirchen
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=20220526144325.4SicMxRx4IeZn8lig5rn8dPjQJGft5v80GoCXfTdG5g@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).