[Opendnssec-develop] Move to git

[Rickard Bellgrim]

>
> I can try and add some doc on that.
>

I get the following error when fetching and merging from upstream:

$ git fetch upstream
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
Unpacking objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 1 (delta 0)
>From https://github.com/opendnssec/SoftHSMv2
 * [new branch]      master     -> upstream/master

$ git merge --ff-only upstream/master master
fatal: Not possible to fast-forward, aborting.


But it works when I do:

$ git merge upstream/master
Updating 71eb9bb..89859e8
Fast-forward
 src/bin/dump/softhsm-dump-db.cpp |    1 +
 1 file changed, 1 insertion(+)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140207/a83cecba/attachment.htm>