[Koha-devel] 2 duplicated commits in the kc.org repo, on master branch ?

[Mason James]

On 2012-03-15, at 1:14 AM, Mason James wrote:

> 
> On 2012-03-15, at 12:54 AM, Chris Nighswonger wrote:
> 
>> 2012/3/14 Mason James <mtj at 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?
> 

actually, i take that back
i seem to be having more rebase problems with my local repo, that are resolved after deleting one of those duped commits...

so... its still a general problem, i think?

paul.p , please fix?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 535 bytes
Desc: This is a digitally signed message part
URL: </pipermail/koha-devel/attachments/20120315/b8d396db/attachment.pgp>