Merge Conflict

[akshatvg]

#4

We forced the git push once and it’s showing merge conflicts ever since. What could we do to resolve them?

[L04DB4L4NC3R]

Your conflict is in the following files:

Backend/engagement/db.sqlite3
Backend/engagement/engagement/__pycache__/__init__.cpython-37.pyc
Backend/engagement/engagement/__pycache__/settings.cpython-37.pyc
Backend/engagement/engagement/__pycache__/urls.cpython-37.pyc
Backend/engagement/engagement/__pycache__/wsgi.cpython-37.pyc
Backend/engagement/fileuploader/__pycache__/__init__.cpython-37.pyc
Backend/engagement/fileuploader/__pycache__/admin.cpython-37.pyc
Backend/engagement/fileuploader/__pycache__/models.cpython-37.pyc
Backend/engagement/fileuploader/__pycache__/urls.cpython-37.pyc
Backend/engagement/fileuploader/__pycache__/views.cpython-37.pyc
Backend/engagement/fileuploader/migrations/__pycache__/0001_initial.cpython-37.pyc
Backend/engagement/fileuploader/migrations/__pycache__/0002_auto_20190823_1357.cpython-37.pyc
Backend/engagement/fileuploader/migrations/__pycache__/0003_document.cpython-37.pyc
Backend/engagement/fileuploader/migrations/__pycache__/__init__.cpython-37.pyc

All of these files are python compiled bytecode pyc and the sqlite db. Delete those, and push again, it will be resolved.
When you push again, make sure you add *.pyc and the sqlite db in gitignore