> [...] and merged also but it was giving same error again and again. bash% git fetch origin (assuming your remote is "origin" - which is typically the default) bash% git merge origin/master bash% git push origin master
If this for some reason does not work (I can not understand why it should not - but anyway) you can always force: bash% git push -f origin master The force (-f) will override the protection which is creating trouble for you - but before doing that; be certain you want to overwrite what is on the remote! -- You received this message because you are subscribed to the Google Groups "Django users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/django-users. To view this discussion on the web visit https://groups.google.com/d/msgid/django-users/CALKD1M8tyreNccmg%3DP-xPfo%2BDX94Wmmunit69A%3DqmHFR%2BjR4AQ%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
