git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* How juggle branches?
@ 2018-01-29 21:24 Andrzej
  2018-01-30  0:16 ` Patryk Obara
  2018-02-08 14:03 ` Automatic parameters completion Andrzej
  0 siblings, 2 replies; 4+ messages in thread
From: Andrzej @ 2018-01-29 21:24 UTC (permalink / raw)
  To: git

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-02-08 14:23 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-29 21:24 How juggle branches? Andrzej
2018-01-30  0:16 ` Patryk Obara
2018-02-08 14:03 ` Automatic parameters completion Andrzej
2018-02-08 14:22   ` Stephen R Guglielmo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).