Re: mingw.org-wsl .gitignore

On Wed, Oct 10, 2012 at 7:08 AM, Keith Marshall wrote:
>>>> ChangeEntry*
>>>> ChangeItem*
>>>
>>> I'll need to research your earlier posts, to fully understand your
>>> intent for these; if you don't want them tracked, then okay.
>>
>> See the "RFC: Repository workflow ..." subject.
>
> Thanks.  I'd seen the reference on a cursory initial read, but felt I
> needed more time to digest it.  Personally, I don't see the need for
> these latter two[*], but if you find them useful, that's okay.
>

With the new workflow I've given, I don't either.

> [*] I normally just accumulate branch specific ChangeLog entries in
> place, on their respective branches.  Sure, that normally creates merge
> conflicts, but, perhaps because hg is more helpful[**] than git during
> merges, I've never found that to be a significant problem.
>
> [**] hg offers to resolve conflicts interactively, during the merge
> operation itself; with vim configured as my editor, I see a three-way
> vimdiff of the two parent heads vs. the merged result, and it doesn't
> usually entail too much effort to refine this.
>

Yea, git has an interactive option as well.  I was just trying to
avoid the need to deal with it.  Honestly the amount of people working
on it at the moment probably will never present a conflict.  I hope
that changes in the future.

-- 
Earnie
-- https://sites.google.com/site/earnieboyd

------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev