Github messages for voidlinux
 help / color / mirror / Atom feed
From: abenson <abenson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: adobe-flash-plugin: update to 32.0.0.445.
Date: Tue, 10 Nov 2020 15:55:45 +0100	[thread overview]
Message-ID: <20201110145545.P6dHe-nGkp8HOED05kLwqWPTslJwjUV5e4TLBtYQNg8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26088@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/26088#issuecomment-724754073

Comment:
Looks like you need to rebase on master, there's been a few updates to the package before yours.

     git remote add upstream git@github.com:void-linux/void-packages
     git pull upstream master --rebase --autostash

It'll complain of a conflict, edit `srcpkgs/adobe-flash-plugin/template` to be correct, then `git add srcpkgs/adobe-flash-plugin/template` and finish the rebase.

    git rebase --continue

Then you can repush.

  parent reply	other threads:[~2020-11-10 14:55 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02 17:56 [PR PATCH] " rc-05
2020-11-02 17:57 ` [PR PATCH] [Updated] " rc-05
2020-11-09  3:33 ` [WIP] " ericonr
2020-11-10  1:03 ` [PR PATCH] [Closed]: " rc-05
2020-11-10  1:19 ` ericonr
2020-11-10  1:24 ` rc-05
2020-11-10  1:31 ` abenson
2020-11-10  1:43 ` [PR PATCH] [Updated] " rc-05
2020-11-10  1:50 ` rc-05
2020-11-10  1:52 ` rc-05
2020-11-10  2:01 ` [PR PATCH] [Updated] " rc-05
2020-11-10  2:05 ` rc-05
2020-11-10  2:06 ` rc-05
2020-11-10 14:55 ` abenson [this message]
2020-11-10 15:05 ` rc-05
2020-11-10 15:12 ` rc-05
2020-11-10 15:14 ` [PR PATCH] [Updated] " rc-05
2020-11-10 15:15 ` rc-05
2020-11-10 21:04 ` abenson
2020-11-10 21:12 ` abenson
2020-11-10 23:25 ` [PR PATCH] [Updated] " rc-05
2020-11-21 21:49 ` [PR PATCH] [Merged]: adobe-flash-plugin: update to 32.0.0.453 the-maldridge

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=20201110145545.P6dHe-nGkp8HOED05kLwqWPTslJwjUV5e4TLBtYQNg8@z \
    --to=abenson@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).