[ https://issues.apache.org/jira/browse/KAFKA-2328?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14631432#comment-14631432 ]
Ismael Juma commented on KAFKA-2328: ------------------------------------ OK, I was wrong, there is code to restore the branch in the script. You can see it being done here: {code} Restoring head pointer to 99c0686b git checkout 99c0686b Note: checking out '99c0686b' {code} The problem is that the way it figured out what branch to restore is giving the wrong results. Will investigate. > merge-kafka-pr.py script should not leave user in a detached branch > ------------------------------------------------------------------- > > Key: KAFKA-2328 > URL: https://issues.apache.org/jira/browse/KAFKA-2328 > Project: Kafka > Issue Type: Improvement > Reporter: Ismael Juma > Assignee: Ismael Juma > Priority: Minor > > [~gwenshap] asked: > "If I start a merge and cancel (say, by choosing 'n' when asked if I want to > proceed), I'm left on a detached branch. Any chance the script can put me > back in the original branch? or in trunk?" > Reference > https://issues.apache.org/jira/browse/KAFKA-2187?focusedCommentId=14621243&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14621243 -- This message was sent by Atlassian JIRA (v6.3.4#6332)