Some changes were made, committed, and conflicting in some files. If you did not% done%, it would solve as follows:
git stash
git pull
git stash pop
But with commits done, how can a commits be made while keeping git pull...
asked by
22.06.2017 / 14:32