gerritv / Grbl-Panel

A control panel for Grbl
MIT License
180 stars 102 forks source link

Localization #74

Closed BernardG closed 7 years ago

BernardG commented 7 years ago

I need to create a new fork/branch to be able to merge the changes I made locally to the current master "branch"

gerritv commented 7 years ago

@BernardG Would it be best for me to create a new branch and give you write permissions? That way we can keep Master for current releases and still keep things in line for the future? I am not very in tune with Git wording, I find it obtuse and confusing.

BernardG commented 7 years ago

Hi Gerrit

I agree, I just spent some time trying to figure out how to merge my changes, knowing that I was not working with your last version. I realized that after a little while, when testing against Grbl v1.1 and getting a nice exception! I have been looking for mistakes I could have made, until I realized the code I had was just before your release for Grbl v1.1!

I finally made it, pffff! I guess a new branch would be the best way to keep those 2 separates, and merge (prune?) back once everything is OK.

We will manage….Just takes time. Take care

De : Gerrit Visser [mailto:notifications@github.com] Envoyé : mardi 8 novembre 2016 20:50 À : gerritv/Grbl-Panel Grbl-Panel@noreply.github.com Cc : Bernard Grosperrin bgrosperrin@laposte.net; Mention mention@noreply.github.com Objet : Re: [gerritv/Grbl-Panel] Localization (#74)

@BernardGhttps://github.com/BernardG Would it be best for me to create a new branch and give you write permissions? That way we can keep Master for current releases and still keep things in line for the future? I am not very in tune with Git wording, I find it obtuse and confusing.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/gerritv/Grbl-Panel/pull/74#issuecomment-259240142, or mute the threadhttps://github.com/notifications/unsubscribe-auth/ACqmmVxMX6cCRjQCQcmIHZ0lRAHLH62zks5q8NJZgaJpZM4KsysB.

gerritv commented 7 years ago

Closed with Release 1.0.9.8, a huge Thank you to @BernardG for doing this very useful work.