Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: >> But I started wondering (especially after read Junio's example) if you >> might have to stop and force edit the message even for commits you >> "pick", once you have a conflict. The patch might not conflict, but >> with your logic shouldn't you be given a chance to amend messages, now >> it was discovered that the upstream did change that overlaps what you >> did? > > You do. With a conflict, it stops. If you do not commit, but only > resolve the conflicts and add them to the index, then continue the rebase > -i, it will ask you to commit. Interactively. (IOW an editor is fired > up.) I might be misreading it, but my understanding of the scenario is: - you have pick A, pick B and pick C; - you reordered them to pick C, pick B and pick A; - the first one, pick C failed, and "add -u && rebase --continue" does ask for that pick C. However, if neither pick B and pick A after that step has textual conflicts, the command does not stop for them, and does not give you a chance to adjust their potentially stale commit log messages. I've already stated my position on this issue earlier in the thread. -- 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
