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 [[email protected]] on behalf of Simon Richter [[email protected]] Sent: 18 July 2016 20:18 To: [email protected] 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 : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
