kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

Mario,

Simon's patch merged cleanly.  I just finished building and testing it
and everything seems in order.  I need a commit message from you.  I do
not have time to search through the commit history of your branch and
put together a meaningful commit message.  The other option is that I
can commit it with a simple commit message such as "Mario's 3D viewer
improvements."  I would prefer something a bit more meaningful.

Thanks,

Wayne

On 7/19/2016 10:41 AM, Mário Luzeiro wrote:
> Hi Simon,
> 
> 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?
> 
> 
> The issues with the merge, are related when the Cirilo branch was merged on main branch.
> There was some improper deal with that folders and files and our branches didn't keep the track.
> 
> 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?)
> 
> Regards,
> Mario Luzeiro
> ________________________________________
> From: Kicad-developers [kicad-developers-bounces+mrluzeiro=ua.pt@xxxxxxxxxxxxxxxxxxx] on behalf of Simon Richter [Simon.Richter@xxxxxxxxxx]
> Sent: 18 July 2016 20:18
> To: kicad-developers@xxxxxxxxxxxxxxxxxxx
> Subject: Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation
> 
> Hi,
> 
> On 18.07.2016 19:54, Wayne Stambaugh wrote:
> 
>> I could not merge your branch into the product branch.  Here is the
>> merge error message:
> 
> Rebasing that branch is going to be difficult because of all the
> backmerges from mainline.
> 
> If we don't care about the branch history, I've attached a diff between
> the current product branch tip and Mario's branch (fixing one conflict
> in a comment and reverting the bitmaps).
> 
>    Simon
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>