← Back to team overview

kicad-developers team mailing list archive

Re: 3D-Viewer - Request for merge evaluation

 

Hi Mário,

> I've updated my branch with latest changes and clean the conflicts,
> As I am not an expert, I am not sure how can I revert the old generated bitmaps,
> would you mind to make a new branch for me?

With bzr, that is difficult.

> I don't mind (and I prefer) that my branch history is lost, i.e. not merged on the main branch. 
> I dont know how that process of merge works, but it will be OK for me if you just copy / add / replace it and just give me credit on the commit email.
> (on a single commit?)

That's the best course then. Can you prepare a commit message for Wayne
so we don't have to go with "misc 3d viewer improvements"?

   Simon


Attachment: signature.asc
Description: OpenPGP digital signature


References