@NTULINUX I deleted your magma branch and updated it with the current magma branch. The difference is that now magma is branched off of vulcano. This means that now git knows the common history of master and magma and so it would be possible to merge magma into master.
ShabbyX
commented
11 years ago
@NTULINUX I deleted your magma branch and updated it with the current magma branch. The difference is that now magma is branched off of vulcano. This means that now git knows the common history of master and magma and so it would be possible to merge magma into master.