Service disruption: git converter currently down
rysto32 at gmail.com
Mon Sep 30 19:17:11 UTC 2019
On Thu, Sep 26, 2019 at 10:27 AM Ed Maste <emaste at freebsd.org> wrote:
> If you try this in a tree with changes (i.e., try applying it to a
> long-running merge-based branch) every modified file will result in a
> conflict, but they can be trivially resolved in favour of the first
> version. From that point on merging from the "new" conversion will
> work as expected.
You don't have to do this manually. "git merge -s ours
origin/svn_head" will record a merge but will not make any changes to
the local tree.
More information about the freebsd-git