Your diagram got distorted, and I'm not totally sure what you meant
about your workflow - hopefully you're rebasing dev onto (with base)
master and then merging dev into master. In any case, the answer to
your question is that performing any operation on one branch does not
affect another branch. A branch is simply a pointer to a given
commit. Changing one branch (committing to it, merging into it,
rebasing it) only changes that branch. All other branches still point
to the same commit they did before.
Note that this may not actually be what you want, though. Suppose you
have this:
o -- o -- o -- o (master)
\
A -- B (dev)
\
o -- o (feature1)
and you rebase dev onto master. You'll end up with this:
o -- o -- o -- o (master) -- A' -- B' (dev)
\
A
\
o -- o (feature1)
and then you'll have trouble merging in feature1, since A and A' are
now two different commits changing the same file.
Jeffrey
On Feb 16, 6:29 am, CrazyScorpio12 <[email protected]> wrote:
> Hi all,
>
> We have the following branch sctucture:
>
> master-------------------------------------------------------\ (Master
> rebased with dev)
> \---------Development------------------------------------/ (dev merged
> with master)
> \------Feature 1 ------------ ?
>
> My question, will merging and rebasing master/development affect
> 'Feature 1' branch? If yes can it be avoided by using any other
> method, like using tags instead of branches?
>
> Thanks in advance,
> Aashish
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
