scwebd
6/7/2018 - 4:22 PM

Steps to Fix Merge Conflicts in Forked GitLab Repo

gitLabMergeConflictSteps
content_copyfile_download
*IF YOU HAVE MERGE CONFLICTS:*

First, add and commit all of your local changes, then...

`git reset --hard HEAD`
`git merge upstream/master -Xours`