[kwlug-disc] Advanced(?) Git usage question
jvj at golden.net
Tue Apr 15 20:47:41 EDT 2014
As a new Git user (and budding enthusiast) I am following this thread
While not directly related to Git, I will toss out this story about
revision control in general.
A few years ago, when interviewing a candidate for a job he told me that
one of the fellows in the development team would check out code, work
with it for 6 months or so. All without checking in the work (or I
assume merging). And when the work was checked in, a lot of work was
required, on the part of the team (of course), to reconcile the changes.
The problem: The culprit was the lead developer, the team manager.
A tip on Git that I read somewhere was to develop a consistent style in
the git commit messages, e.g. git -am [message text], so as to make
subsequent searches easier. For example, if one was using an issue
tracking system with issues SCR 1024 SCR 2031 SCR 112 being active and
the commit was to combine repairs that addressed these issues, the
commit message could be: git commit -am "issues: SCR 1024 SCR 2031 SCR
112" or similar.
In this example: SCR == Software Change Request.
On 2014-04-15 20:26, Jonathan Poole wrote:
> Yes, we had a fellow that was 42 days behind on his branch, spent a few weeks rebasing, and then ultimately just merging and dealing with the mess. Rebase is your friend.
> On Apr 15, 2014, at 8:09 PM, Chris Frey<cdfrey at foursquare.net> wrote:
>> On Tue, Apr 15, 2014 at 07:43:13PM -0400, Jonathan Poole wrote:
>>> I've adopted the git-flow branching model at home, and work.
>>> With little hesitations now, we are growing to love it. Merging and
>>> rebasing is fairly straightforward, but I don't know what kind of code
>>> your writing that would not inherit the model successfully.
>> I assume you're referring to this:
>> I mostly do use that flow, but in my experience, the number of merge
>> commits (as opposed to fast-forwards) are pretty low, since I highly
>> favour rebasing before ultimately merging with master, wherever possible.
>> It keeps history simple, and keeps my development in sync with the
>> lastest good code.
>> - Chris
>> kwlug-disc mailing list
>> kwlug-disc at kwlug.org
> kwlug-disc mailing list
> kwlug-disc at kwlug.org
> Checked by AVG - www.avg.com
> Version: 2014.0.4355 / Virus Database: 3882/7345 - Release Date: 04/14/14
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the kwlug-disc