Closed pc2752 closed 4 years ago
I'm not sure why the conflicts are not showing up on my end again, but I've made the changes required.
git fetch origin and git pull just show "Already up-to-date", with no conflicts. But this page shows conflicts in 5 files.
what branch are you on when you're running those commands? your add_composition
one? You'll have to merge master into the branch to fix these conflicts. Try this:
git checkout master
git fetch origin
git merge origin/master
git checkout add_composition
git merge master
great, thanks. Will get this merged today
I've made some changes to this, please take a look at them:
Can you please look at the tests for musiccomposition and update the following things:
thanks!
Looks good, but I see 3 failing tests:
This PR can delete work.py too, if this code is duplicated