Fixing git/github merge conflicts
Introduction In our previous article on the git version control system, we explained how we could modify our files in repositories in our GitHub account and then pull the changes from GitHub to the git…
Category: merge conflict