[Owasp-esapi-c++] Minor Errata Checkins?
david.anderson at aspectsecurity.com
Mon Aug 8 19:13:38 EDT 2011
I assume a policy of: you broke it, you fix it. That tends to keep my checkins more small and focused than massive.
On Aug 8, 2011, at 6:47 PM, "Jeffrey Walton" <noloader at gmail.com> wrote:
> Hi All,
> How does the project want to proceed with minor errata checkins?
> I feel its best to get the small checkins as soon a possible. If
> everyone is updating regularly, the changes usually merge OK.
> In the past at other places, I've found some folks don't update and
> then want to checkin a massive number changes. For example, a
> developer will work on a few class files for a week or two, not
> update, and then want to check in. Under these circumstances, I've
> found the merge goes awry. The result is usually "Replace my copy with
> the working copy", which ends up discarding earlier the incremental
> Any ideas on keeping the merges trouble free?
> Owasp-esapi-c++ mailing list
> Owasp-esapi-c++ at lists.owasp.org
More information about the Owasp-esapi-c++