Re: [Pyscard-devel] Reintegrating the python3 branch

[Ludovic R. <lud...@gm...>]

2015-07-01 2:10 GMT+02:00 Alex Willmer <al...@mo...>:
> Ludovic,

Hello,

> I've merged your master branch and your python3 branch into
> https://github.com/moreati/pyscard/tree/python3. The merge commit it
> large (1000+ lines added/removed) but to my limited git-fu it seems
> the least worst option.
>
> Do you want it as a pull request? If so, into master or back into python3?

Good exercise. I will do the merge myself.

> Alternatively I also tried it as a rebase of your python3 branch on
> your master, https://github.com/moreati/pyscard/tree/python3_rebase.

I guess you had conflicts?

> Feel free to reject/ignore them both - I did them a learning exercise
> as much as anything.

OK

Bye

-- 
 Dr. Ludovic Rousseau