public inbox for gentoo-science@lists.gentoo.org
 help / color / mirror / Atom feed
From: justin <jlec@gentoo.org>
To: gentoo-science@lists.gentoo.org
Subject: Re: [gentoo-science] github and o.g.o sync
Date: Fri, 06 Jul 2012 11:15:25 +0200	[thread overview]
Message-ID: <4FF6ACAD.20001@gentoo.org> (raw)
In-Reply-To: <4FF698FB.6040501@gmail.com>

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

On 06/07/12 09:51, Kacper Kowalik wrote:
> On 07/05/2012 10:46 PM, Christoph Junghans wrote:
>> Hi,
>>
>> recently it happened to me that the sci overlay on github and o.g.o
>> got out of sync.
>> (timcera pushed to github only and I pushed to o.g.o first and then
>> the push to the 2nd url failed)
>>
>> I really think we should autosync them as with more pull request this
>> situation will get more likely.
> To my knowledge it's impossible to sync two rw git repos. All severe
> conflicts need manual resolution, the trival ones are delt with git
> push/pull --all already.
> Both repos were out of sync just a momement ago, but it was "fixable" in

fixable -> octupus

I love that term.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 302 bytes --]

  reply	other threads:[~2012-07-06 12:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-05 20:46 [gentoo-science] github and o.g.o sync Christoph Junghans
2012-07-06  7:51 ` Kacper Kowalik
2012-07-06  9:15   ` justin [this message]
2012-07-06  8:01 ` justin

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=4FF6ACAD.20001@gentoo.org \
    --to=jlec@gentoo.org \
    --cc=gentoo-science@lists.gentoo.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