From: hsnfirdaus <hsnfirdaus@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support
Date: Mon, 28 Nov 2022 14:04:18 +0100 [thread overview]
Message-ID: <20221128130418.3mmqpLWHpOO976ucOtZUFenxtVWXdLyoAF9xWDe5mi0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38942@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 853 bytes --]
New comment by hsnfirdaus on void-packages repository
https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329055725
Comment:
> ```
> git rebase master nm-openvpn
> ```
@kruceter how about this message when i run it:
```
...
Rebasing (131/160618)
Rebasing (132/160618)
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
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".
Could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
```
next prev parent reply other threads:[~2022-11-28 13:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-27 11:44 [PR PATCH] " hsnfirdaus
2022-11-26 2:27 ` [PR PATCH] [Updated] " hsnfirdaus
2022-11-28 12:11 ` hsnfirdaus
2022-11-28 12:16 ` kruceter
2022-11-28 12:22 ` [PR PATCH] [Updated] " hsnfirdaus
2022-11-28 12:25 ` hsnfirdaus
2022-11-28 12:31 ` kruceter
2022-11-28 12:36 ` kruceter
2022-11-28 12:37 ` kruceter
2022-11-28 13:04 ` hsnfirdaus [this message]
2022-11-28 13:07 ` hsnfirdaus
2022-11-28 13:09 ` hsnfirdaus
2022-11-28 13:11 ` kruceter
2022-11-28 13:14 ` paper42
2022-11-28 13:25 ` hsnfirdaus
2022-11-28 13:26 ` paper42
2022-11-28 13:38 ` [PR PATCH] [Updated] " hsnfirdaus
2022-11-28 13:40 ` hsnfirdaus
2022-11-28 13:41 ` [PR REVIEW] " paper42
2022-11-28 13:42 ` paper42
2022-11-28 13:44 ` [PR PATCH] [Updated] " hsnfirdaus
2022-11-29 23:03 ` [PR PATCH] [Merged]: " paper42
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=20221128130418.3mmqpLWHpOO976ucOtZUFenxtVWXdLyoAF9xWDe5mi0@z \
--to=hsnfirdaus@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).