git - merge & conflict resolution

I just got walloped after I performed a git pull origin master on my project. Two files ended up failing the auto merge and were left with conflicts.

I hope I edited them properly …

Category: Code


Leave a Reply



↑ Back to top