On 08.03.2012 18:30, Junio C Hamano wrote:
Johannes Sixt<j.sixt@xxxxxxxxxxxxx> writes:To avoid the situation,... This would not be necessary if the order of the merge parents could be specified, e.g.: # on topic git merge --into masterI think the underlying mechanism needed to implement the above shares a lot with what Jeff called "crazy idea", but where you would want to be after such a merge may be different in these two cases.
I don't think there is much question that you should still be in the same branch. Not because you necessarily want to be in that branch. But because it would be surprising if git-merge changed your branch sometimes and most times not.
-- 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