On Sun, Jan 3, 2016 at 1:26 AM, Marko Rauhamaa <ma...@pacujo.net> wrote: > Chris Angelico <ros...@gmail.com>: > >> I don't think you understand the meaning of "merge conflict", then. A >> merge conflict is when you cannot simply merge the changes. > > A conflict is when there have been two parallel changes to the same > versioned target. In the case of Hg and Git, the whole repo is the > target.
No, that's just a merge. https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging ChrisA -- https://mail.python.org/mailman/listinfo/python-list
