On Mon, Jan 25, 2016 at 6:26 AM, sebb <seb...@gmail.com> wrote:
> I've noticed this a few times now.
>
> The change below was originally pushed by me to master:
>
> ------ cut here-----
> Commit a16880742e06cca261f98a06fba476e273d79ed0:
> Makes more sense to keep personal details together so each uid appears
> once only. The uid data can later be expanded if necessary
>
>
> Branch: refs/heads/master
> Author: Sebb <s...@apache.org>
> Committer: Sebb <s...@apache.org>
> Pusher: sebb <s...@apache.org>
>
> ------------------------------------------------------------
> www/roster/public_ldap_committers.rb | +++++ -----
> ------------------------------------------------------------
> 69 changes: 34 additions, 35 deletions.
> ------------------------------------------------------------
>
>
> diff --git a/www/roster/public_ldap_committers.rb
> b/www/roster/public_ldap_committers.rb
> index e039fda..da9401a 100644
> --- a/www/roster/public_ldap_committers.rb
> +++ b/www/roster/public_ldap_committers.rb
> ------ cut here-----
>
> So why do we now get a duplicate message attributing the change to you?
That appears to be a bug in the script that produces these
notifications. My understanding is that instead of using an existing
package (e.g. git-multimail), the infrastructure team opted to "roll
their own" script.
> The same has happened in the reverse, i.e. sometimes I end up
> apparenty repeating a change you made.
>
> Is there perhaps a process we could follow to avoid this confusing
> duplication?
There is indeed. However, if the long term plan is to enable wide use
of GitHub, having us workaround the bug in the notification script
doesn't scale.
Before committing, the following is a viable strategy:
git stash
git pull
git stash apply
If you have already committed, and then found that you needed to
produce a "merge commit" (e.g., by doing a git pull), do the
following:
git rebase -i master
< Choose 'squash' for all of your commits except the first one. >
< Edit the commit message to make sense, and describe all your changes. >
- Sam Ruby
> On 24 January 2016 at 19:47, Sam Ruby <ru...@apache.org> wrote:
>> Commit 79f4989be128c2d56e4520e185e4f59e3e390c6f:
>> Merge branch 'master' of github.com:apache/whimsy
>>
>>
>> Branch: refs/heads/master
>> Author: Sam Ruby <ru...@intertwingly.net>
>> Committer: Sam Ruby <ru...@intertwingly.net>
>> Pusher: rubys <ru...@apache.org>
>>
>> ------------------------------------------------------------
>> www/roster/public_ldap_committers.rb | +++++ -----
>> ------------------------------------------------------------
>> 69 changes: 34 additions, 35 deletions.
>> ------------------------------------------------------------
>>
>>
>> diff --git a/www/roster/public_ldap_committers.rb
>> b/www/roster/public_ldap_committers.rb
>> index e039fda..da9401a 100644
>> --- a/www/roster/public_ldap_committers.rb
>> +++ b/www/roster/public_ldap_committers.rb
>
> <snip>
