Rebase and merge both make sense depending on the situation. No need to have a hard and fast rule about it.
This conversation is moot if folks don't understand Git properly. Let's give it time, no point in forcing this new. Thanks, Om On Jul 10, 2014 9:19 AM, "Jose Barragan" <jose.barra...@codeoscopic.com> wrote: > Hi Erik, > > Sorry about that, you're right. > > But after read the atlassian's article, I supposed that I hasn't any good > reason to maintain the proposal alive, because seems as simply is one of > two main flavours of work with git, even I keep on thinking that is the > best, but maybe is just my point of view. > > Anyway, just now I remade again the “experimental/VF2JS” branch and push > it. > > Thanks, > ______________________ > Jose Barragan > Senior Software Engineer > Codeoscopic > +34 912 94 80 80 > http://www.codeoscopic.com > > On 10 Jul 2014, at 17:32, Erik de Bruin <e...@ixsoftware.nl> wrote: > > > Jose, > > > > I'm not sure why you just now deleted the new branch you created? Like > with > > your creation of it, that seems very sudden. I may still decide that your > > way is the way to go, but I need to understand first what I was doing > > wrong, and how your method is a better workflow. > > > > Everyone else, > > > > I'm just trying to understand how to work with git. @Fred: the wiki does > > not explain the use case where I'm working off a remotely published > feature > > branch, I checked before I started. Since the wiki couldn't tell me what > to > > do, I asked the question in this recent email thread: "New Flex to JS > > project." I think I correctly implemented the most easy to follow > > instructions. > > > > So, first things first: what am I doing wrong in my workflow? > > > > EdB >
