search

statebox / cql

CQL: Categorical Query Language implementation in Haskell
GNU Affero General Public License v3.0
162 stars 14 forks source link

move aql files to separate directory #58 #74

Closed marcosh closed 5 years ago

marcosh commented 5 years ago

as suggested by @epost, I moved the .aql files in a separate directory

wisnesky commented 5 years ago

I changed the Delta and Sigma files and it says my only option to resolve the commits is command line git. Please advise.

marcosh commented 5 years ago

I solved the conflicts using these commands, starting from the master branch:

git checkout 58/add-example-files-to-automatic-tests
git rebase master
git push origin 58/add-example-files-to-automatic-tests --force-with-lease