This series of patches updates "stg push" to leave conflicts in the index, in the normal git fashion. This means that conflict handling and resolution are handled by git and not stg, which should make it possible to simplify stg quite a bit. For instance, the 'conflicts' file should go away. Unfortunately, this patch series isn't complete, since it doesn't remove all uses of the stg merge code. The remaining client of that code is the "sync" command, which I have never used, and haven't studied very much. But if that command is changed somehow, then most of the code in gitmergeonefile.py will go simply away. And the 'conflicts' file will not be used. See also previous discussions: https://gna.org/task/?5140 http://thread.gmane.org/gmane.comp.version-control.git/48271 -- David KÃ¥gedal - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
