4 ms·
Also, doesn't it tell you to do thst when the conflict happens? edit, yup: $ git status # On branch master # Your branch and 'origin/master' have
by llimllib 16y ago
Also, doesn't it tell you to do thst when the conflict happens?
edit, yup:
$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: readme
#
no changes added to commit (use "git add" and/or "git commit -a")
- MikeTaylor 16y agoNope.
- llimllib 16y agosee above, I edited to add what I'm talking about
- MikeTaylor 16y agoMy bad, I was wrong on this. I would just delete my comment, but that would leave your replies looking dumb. Instead, feel free to downvote my earlier "Nope." into oblivion.
- llimllib 16y agoNo worries, color me unoffended. I should have generated the message I was talking about before I posted anyway.
- pyre 16y agoI'm confused about what part of: (use "git add/rm <file>..." as appropriate to mark resolution) is confusing...