François Bissey edited this page Jul 2, 2014 · 6 revisions
Clone this wiki locally

Welcome to the sci wiki!

Configuring your git clone localy

Make sure that your .git/config has the following settings:

[remote "origin"]
    fetch = +refs/heads/*:refs/remotes/origin/*
    url = git+ssh://git@git.overlays.gentoo.org/proj/sci.git
    pushurl = git@github.com:gentoo-science/sci.git
    pushurl = git+ssh://git@git.overlays.gentoo.org/proj/sci.git
[remote "github"]
    url = git@github.com:gentoo-science/sci.git
    fetch = +refs/heads/*:refs/remotes/github/*

You can pull/push to both repos at once using --all switch.

Handling PRs

This assumes that you're using config described above.

  • Get the PR (I'll use PR 3 as an example), please notice that github provides some useful info on the PR itself, like: nbigaouette wants someone to merge 11 commits into gentoo-science:master from nbigaouette:gdebugger

      $ git fetch github
      $ git checkout -b nbigaouette-gdebugger master --no-track
      $ git pull https://github.com/nbigaouette/sci.git gdebugger
  • Go wild evaluating PR, edit if necessary, add, push

  • Merge PR

      $ git fetch github
      $ git checkout master
      $ git merge nbigaouette-gdebugger
      $ git -D nbigaouette-gdebugger
      $ git push --all

If gentoo.overlay.org and github get out of sync

Make sure your .git/config is correct as above. Use merge-dualHEAD located in the script folder of the overlay

    $ ./script/merge-dualHEAD