On Thu, Aug 28, 2014 at 3:14 AM, Marko Rauhamaa <ma...@pacujo.net> wrote: > Thanks for the tip. I've been looking for the magic bullet since I had > to abandon Sun's TeamWare years back. Unfortunately, fossil seems to > suffer from the same problem as git and hg: they all consider the whole > repository to be the version-controlled "file". There are no independent > changes; parallel changes always result in a conflict that requires > merging.
This is a feature, not a problem. As far as most version control systems are concerned, files aren't independent. However, the merge should be trivially easy if it's different files that have changed. If what you're concerned about is the number of merge commits, the easiest solution is to perform rebase pulls (or to rebase a change onto the latest tree, depending on your point of view). That's not as easy with github's fork/merge philosophy as it is with your own commits, but I find it's extremely easy with a pull/push model, and not too hard with other models. ChrisA -- https://mail.python.org/mailman/listinfo/python-list
