14 Mar
2012
14 Mar
'12
12:14 p.m.
On 2012-03-15, at 12:54 AM, Chris Nighswonger wrote:
2012/3/14 Mason James <mtj@kohaaloha.com>
On 2012-03-14, at 7:24 PM, Mason James wrote:
hi People
i believe there are 2 duplicated commits in the kc.org repo currently, that need to be corrected (by deleting 1 commit?)
This has happened from time to time in the past in master. I seem to recall it causing a problem with my local branch once, but I deleted and recreated the branch and the problem disappeared.
Kind Regards, Chris
aaah, some good news... one (or three?) 'git reset --hard origin/master' later, my merge worked just fine... :) so the duped commits are no longer a problem for me :) paul.p, will you fix these commits in the kc.org repo?