From: Andrzej <borucki_andrzej@wp.pl>
To: git@vger.kernel.org
Subject: How juggle branches?
Date: Mon, 29 Jan 2018 22:24:34 +0100 [thread overview]
Message-ID: <29b0272d-7854-592d-5e1c-3a4f0d347bd1@wp.pl> (raw)
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.
next reply other threads:[~2018-01-29 21:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 21:24 Andrzej [this message]
2018-01-30 0:16 ` How juggle branches? Patryk Obara
2018-02-08 14:03 ` Automatic parameters completion Andrzej
2018-02-08 14:22 ` Stephen R Guglielmo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=29b0272d-7854-592d-5e1c-3a4f0d347bd1@wp.pl \
--to=borucki_andrzej@wp.pl \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).