> On Oct 30, 2016, at 9:54 PM, Clemens Lang <c...@macports.org> wrote:
> Our Subversion repository has been split into several repositories on
> GitHub.

Please note that Ryan ran the svn2git conversion several times this
weekend, so any clones made previously will have nothing in common with
the final repositories, and a naïve "git pull" will try to produce
a merge commit. This is not desirable.

You should instead press the proverbial reset button. Assuming you made
a straightforward clone and only checked out a local master branch:

        $ git fetch
        $ git reset --hard origin/master
        $ git gc --aggressive

This fetches the new history, forces your local master branch to match
ours, and garbage-collects the old objects.

macports-dev mailing list

Reply via email to