26 Jun
2013
26 Jun
'13
6:31 a.m.
hmm, this is what have been bugging me. That is the workflow I'm used to from git but I got the feeling that I should NEVER merge trunk into one of my feature branches because that would mess up earlier revisions later on in trunk (not sure how though). I will have to set up a new project locally and try it out for myself, that's the best way to learn =)
I don't like to work out of trunk, always branch to a bugfix branch or feature branch. As a response to the checkout/branch difference, yes got that one (I'll stay away from checkouts).
--
Christoffer Holmstedt
2013/6/25 Martin Owens <doctormo@...400...>
> On Tue, 2013-06-25 at 19:52 +0200, Krzysztof Kosiński wrote:
> > In fact merging from trunk from time to
> > time is encouraged, because it allows you to keep up to date and
> > reduces the risk of surprise bugs appearing only after the final
> > merge.
>
> For separate branches, that's right. But if he's working from trunk then
> a push doesn't run a 'merge' on the remote branch, it replaces the
> revision history. At least, that's what happens from experience.
>
> Martin,
>
>