Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.debian.maint.python > #7707
| Path | csiph.com!goblin2!goblin.stu.neva.ru!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stefano Rivera <stefanor@debian.org> |
| Newsgroups | linux.debian.maint.python |
| Subject | Re: git-dpm merge conflicts |
| Date | Tue, 20 Oct 2015 05:30:02 +0200 |
| Message-ID | <qlvMC-8cU-1@gated-at.bofh.it> (permalink) |
| References | <qlunw-5Vc-7@gated-at.bofh.it> |
| X-Original-To | debian-python@lists.debian.org |
| X-Mailbox-Line | From debian-python-request@lists.debian.org Tue Oct 20 03:22:26 2015 |
| Old-Return-Path | <stefano@rivera.za.net> |
| X-Amavis-Spam-Status | No, score=-6.879 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02] autolearn=ham autolearn_force=no |
| X-Policyd-Weight | using cached result; rate: -6.1 |
| Mail-Followup-To | debian-python@lists.debian.org |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=utf-8 |
| Content-Disposition | inline |
| X-Gpg-Public-Key | http://www.rivera.za.net/stefano.gpg |
| User-Agent | Mutt/1.5.23 (2014-03-12) |
| X-Mailing-List | <debian-python@lists.debian.org> archive/latest/13019 |
| List-ID | <debian-python.lists.debian.org> |
| List-URL | <https://lists.debian.org/debian-python/> |
| List-Archive | https://lists.debian.org/msgid-search/20151020032209.GA1023@bach.rivera.co.za |
| Approved | robomod@news.nic.it |
| Lines | 14 |
| Organization | linux.* mail to news gateway |
| Sender | robomod@news.nic.it |
| X-Original-Date | Tue, 20 Oct 2015 05:22:09 +0200 |
| X-Original-Message-ID | <20151020032209.GA1023@bach.rivera.co.za> |
| X-Original-References | <87vba2cnj3.fsf@prune.linuxpenguins.xyz> |
| Xref | csiph.com linux.debian.maint.python:7707 |
Show key headers only | View raw
Hi Brian (2015.10.20_03:54:40_+0200) > When the following error occurs, how can I tell what patch it was > attempting to apply at the time? It's an aborted git rebase, so you should be able to: git show HEAD SR -- Stefano Rivera http://tumbleweed.org.za/ +1 415 683 3272
Back to linux.debian.maint.python | Previous | Next — Previous in thread | Find similar
git-dpm merge conflicts Brian May <bam@debian.org> - 2015-10-20 04:00 +0200 Re: git-dpm merge conflicts Stefano Rivera <stefanor@debian.org> - 2015-10-20 05:30 +0200
csiph-web