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 repositories on our local system and keep the files in synchronization. Now, what if we modified the same piece of […]

The post Fixing git/github merge conflicts appeared first on The Linux Juggernaut.