search

digitalfabrik / coldaid-backend

A fork of the new Integreat cms for the use case of coldaid
Apache License 2.0
4 stars 0 forks source link

Provide testdata #73

Closed joelhmy closed 4 years ago

joelhmy commented 4 years ago

please check the test data

timobrembeck commented 4 years ago

You have conflicts in src/cms/fixtures/test_data.json, which should be resolved before you merge this PR. Make sure your develop-branch is up to date:

git checkout develop
git pull

and rebase your two commits onto the new develop-branch:

git checkout provide_testdata2
git rebase --onto develop provide_testdata2~2 provide_testdata2

Then you should be faced with the merge conflicts which you can resolve. After the conflicts are resolved and the rebase is finished, force-push your changes to make sure your git history doesn't get messed up:

git push --force-with-lease