[git-users] Git merging/rebasing

2010-02-16 Thread CrazyScorpio12
Hi all, We have the following branch sctucture: master---\ (Master rebased with dev) \-Development/ (dev merged with master) \--Feature 1 ? My question

[git-users] Re: Git merging/rebasing

2010-02-16 Thread Jeffrey
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.