From: Andrzej Date: Mon, 29 Jan 2018 21:24:34 GMT Subject: How juggle branches? Message-ID: <29b0272d-7854-592d-5e1c-3a4f0d347bd1@wp.pl> First, I develop program which uses mysql in branch master. Next i change name this branch to before_hbase, and began develop HBase in branch master. I also develop before_hbase. Now, instead HBase will be MapR-DB which will before_hbase , not master succesor. How do: - change before_hbase to master - old master to hbase - develop MapR in mapr branch ? I am in master branch and am changing to hbase: git checkout -b hbase git push origin hbase now worse: I am in branch before_hbase and need change to master git checkout -b master - not works because master exists I must use rebase? I hear, that rebase can be used only in private (.git), not github repositories. If I change to master and copy files and next commit - change will not atomic.