@lepolac sorry didn't see your comment. The approach I usually go for is to update the trunk branch in my fork and merge with my JIRA branch.
``` git pull apache trunk git checkout KAFKA-6195 git merge trunk ``` [ Full content available at: https://github.com/apache/kafka/pull/4485 ] This message was relayed via gitbox.apache.org for [email protected]
