Hi @dattran-vn01 to solve your rebase issue: 1. checkout master branch to local and update it (pull --rebase) to the latest commits 2. create a new local branch from master : checkout -b BEAM-5107-ES6 3. cherry pick the commits you did on branch BEAM-5107-Support-ES-6.x-for-ElasticsearchIO to the new BEAM-5107-ES6 branch. You can cherry pick using Intellij: select the commits in git log history window of branch BEAM-5107-Support-ES-6.x-for-ElasticsearchIO and right-click cherry pick option. It will commit the cherry picked commits to the current branch (BEAM-5107-ES6). Don't forget to remove the "cherry picked from ..." comment in git comment. 4. force push your branch BEAM-5107-ES6 to the remote branch BEAM-5107-Support-ES-6.x-for-ElasticsearchIO to overwrite it. => That way we keep review history and we can close your other PR
[ Full content available at: https://github.com/apache/beam/pull/6211 ] This message was relayed via gitbox.apache.org for [email protected]
