I've wondered about this as well.. Here are my thoughts:
- I think it is healthy to keep features that are going to multiple
branches developed in features branches. Upon completion, the feature can
be merged to any branch where it is needed
- The feature branches should be based
On 11/05/12 16:36, Konstantin Khomoutov wrote:
On Fri, 11 May 2012 04:24:07 -0700 (PDT)
Nikos Chantziarasrea...@gmail.com wrote:
I'm a bit puzzled on how to best forward-port commits from a stable
branch (master in this case), to my experimental branch (let's call
it exp). Both branches are
On Fri, 11 May 2012 18:35:03 +0300
Nikos Chantziaras rea...@gmail.com wrote:
[...]
The consequence is that if you push a branch containing commits
...-A-B-C
(with C being the tip commit) to a public repo, then rebase these
three commits to produce
...-A'-B'-C'
and push it again (this
On 11/05/12 19:38, Konstantin Khomoutov wrote:
On Fri, 11 May 2012 18:35:03 +0300
Nikos Chantziarasrea...@gmail.com wrote:
[...]
I don't want to push something that would require others to rebase.
But from the Pro Git book, in the 3.6 Rebasing section, I had this
in mind:
Do not rebase
On Fri, May 11, 2012 at 09:50:18PM +0300, Nikos Chantziaras wrote:
[...]
The idea with rebasing is that you can rebase any series of commits
(ending with the branch's tip commit) on top of technically any other
series of commit. You do not have to rebase the whole branch. To
rebase a branch
On 12/05/12 01:09, Konstantin Khomoutov wrote:
On Fri, May 11, 2012 at 09:50:18PM +0300, Nikos Chantziaras wrote:
[...]
The problem with rebasing and a public repo would only appear here if
you would have managed to push exp into that public repo after
committing X or Y. If the exp branch ends
On 10/05/2012 12:49 am, Brad wrote:
Could 'Merge branch
master, remote-tracking branch origin' be what happens if I accidentally
typed git merge origin master? If I do this, what happens exactly?
Good guesswork!
One of git's merge algorithms is called an 'octopus merge', and merges
more than
