Hi Carlos,
This merge you did make me think I didn't talk about this case on the wiki
[1], so I updated it, in short, while it is good to start a branch as you
did for a new jira ticket and as you may don't know the final number of
commits you will have at the end, once it is the time to
Hi Frederic,
in our experience working with GIT we saw that was extremely helpful to
have visual track of each set of commits that are a single fix,
functionality, feature or whatever, since you can always operate and have
much control as branches grow and ramifies. In the particular case you
+1 with Carlos
check it out this: Git Patterns and Anti-Patterns: Scaling from Workgroup to
Enterprise
--
Jose Barragan
Chief Software Architect
Codeoscopic Madrid
C/. Infanta Mercedes, 92.
Planta 5. 505.
28020 Madrid.
Tel.: +34 912 94 80 80
On Mar 27, 2013, at 10:35 AM, Jose Barragan
Sorry for missing link: Git Patterns and Anti-Patterns: Scaling from
Workgroup to
Enterprisehttp://refcardz.dzone.com/assets/download/refcard/bf3d79c7ce6019dc5ff28cf76c3f48db/rc178-010d-git-patterns-antipatterns_1.pdf
--
Hi Pepe, the link is tokenized for your use. Here's the public link:
http://refcardz.dzone.com/refcardz/git-patterns-and-anti-patterns
Thanks
Carlos
2013/3/27 Jose Barragán jose.barra...@codeoscopic.com
Sorry for missing link: Git Patterns and Anti-Patterns: Scaling from
Workgroup to
Thanks Carlos, and sorry for the inconvenience
--
Jose Barragan
Chief Software Architect
Codeoscopic Madrid
C/. Infanta Mercedes, 92.
Planta 5. 505.
28020 Madrid.
Tel.: +34 912 94 80 80
On Mar 27, 2013, at 10:58 AM, Carlos Rovira carlos.rov...@codeoscopic.com
wrote:
Hi Pepe, the link is
.
Thanks,
-Fred
-Message d'origine-
From: Carlos Rovira
Sent: Wednesday, March 27, 2013 10:24 AM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Hi Frederic,
in our experience working with GIT we saw that was extremely helpful to
have visual
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Here's how it would Develop, after merging the branches of Charles and Fred, as
you can see, thereby properly appreciate the content of the two applied
Tickets.
However, Justin's commit b5da14a, is visually hidden under
that will be display well.
-Fred
*From:* Jose Barragan jose.barra...@codeoscopic.com
*Sent:* Wednesday, March 27, 2013 1:26 PM
*To:* dev@flex.apache.org
*Subject:* Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Here's how it would Develop, after merging the branches
,
-Fred
-Message d'origine-
From: Carlos Rovira
Sent: Wednesday, March 27, 2013 4:03 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
IMHO this is hard to see, and even more for people outside or coming some
time later in time, but that's only my
change it (but really, I think everyone will be
happy with it).
Thanks,
-Fred
-Message d'origine-
From: Frédéric THOMAS
Sent: Wednesday, March 27, 2013 5:22 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Yeah, for sure, it's your point
change it (but really, I think everyone will be
happy with it).
Thanks,
-Fred
-Message d'origine-
From: Frédéric THOMAS
Sent: Wednesday, March 27, 2013 5:22 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Yeah, for sure, it's your
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Another point Carlos,
this is really a matter of tastes. Each one should be happy with his way
of proceed
What should I do a git wiki with the good practices if at the end everyone
does what he wants, I guess we can try
forced merge.
Thanks,
-Fred
-Message d'origine-
From: Carlos Rovira
Sent: Wednesday, March 27, 2013 4:03 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
IMHO this is hard to see, and even more for people outside or coming some
time
it (but really, I think everyone will be
happy with it).
Thanks,
-Fred
-Message d'origine-
From: Frédéric THOMAS
Sent: Wednesday, March 27, 2013 5:22 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Yeah, for sure, it's your
: Wednesday, March 27, 2013 6:06 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
That's the point Alex...
Any solve can resolve as a single commit or in a change set, and this
decision, under what criterial it does?
--
Jose Barragan
Chief Software
really
develops, there's no artificial forced merge.
Thanks,
-Fred
-Message d'origine-
From: Carlos Rovira
Sent: Wednesday, March 27, 2013 4:03 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
IMHO this is hard to see
myCommit'
Thanks,
-Fred
-Message d'origine-
From: Carlos Rovira
Sent: Wednesday, March 27, 2013 6:47 PM
To: dev@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Hi Alex,
as I said this is a matter of taste, but we are using git with huge
projects
@flex.apache.org
Subject: Re: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Hi Alex,
as I said this is a matter of taste, but we are using git with huge
projects for months and when we are merging and generating releases and we
end wanting to easily see *all* branches to quickly see
19 matches
Mail list logo
