Github: resolving conflict
Conflict 1: hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull…
How to handle conflicts in github
This happens a lot. I will try to write out scenarios I've dealt with.. Here are ways to deal with conflicts Decide to delete the file of conflict from Main…