Closed cccbauer closed 9 years ago
Ok, I merged and pushed again!
did you fetch current master?
git fetch upstream git merge upstream/master
(at this point you will have conflicts that you would need to fix)
git add conflicted file git commit -am "fixed conflicts" git push origin
after putting all this in it says Everything up-to-date! is that ok
could you please merge with current master and push again?