Terry J. Reedy added the comment: For the null merge entry, /filed/files/.
The "create new remote heads". is really needed. I handled a situation wrong again today. Question: commit to 3.2, merge forward without change, push, and message is '... new remote head in 3.2'. Is 3.2 really the only branch with a head conflict? Or would one appear in 3.3 as soon as 3.2 heads are merged and merge is merged forward to 3.3? ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue14468> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
