Overhaul

Riolaurenti commented

2019-05-10 14:09:39 +01:00

(Migrated from github.com)

Finally getting around to overhauling this GIT mess.
Would like you to add Kiki again after the next week.
All was going well... until it wasn't.

I hope we can start getting over it and moving forward.

The only objective now is to amalgamate everything up until this point, delete every branch that isn't master.

We'll try hit the Master/Development/Feature model of progression.

You're the network guy, I believe you should be solely one responsible for the Master and Development branches, Pull requests from the two as our democracy.
Kiki and I and any future collaborators request features only, unless tasks are delegated otherwise.

It got too messy, too many cooks trying to be chefs.
Take a little more control.

@Squatnet Finally getting around to overhauling this GIT mess. Would like you to add Kiki again after the next week. All was going well... until it wasn't. I hope we can start getting over it and moving forward. The only objective now is to amalgamate everything up until this point, delete every branch that isn't master. We'll try hit the Master/Development/Feature model of progression. You're the network guy, I believe you should be solely one responsible for the Master and Development branches, Pull requests from the two as our democracy. Kiki and I and any future collaborators request features only, unless tasks are delegated otherwise. It got too messy, too many cooks trying to be chefs. Take a little more control.

Squatnet commented

2019-05-10 16:08:39 +01:00

(Migrated from github.com)

Hey yeah happily add kiki again. Basically only kicked him as I was trying
to take a little more control. When I got told to stop throwing me toys out
the pram I "threw my toys out the pram"
Anyway whatever. Water. Bridge. I'll get this all together with you
Sunday, if Kieran is there all the better. We'll stage all these changes
to master. Delete all the branches, start again with proper branching model
and push to master disabled.
Sort everything sunday

On Fri, 10 May 2019, 14:09 Riiio, notifications@github.com wrote:

Assigned #86 https://github.com/Squatnet/ArduinoStuff/issues/86 to
@Squatnet https://github.com/Squatnet.

—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
https://github.com/Squatnet/ArduinoStuff/issues/86#event-2333070696, or mute
the thread
https://github.com/notifications/unsubscribe-auth/AGIIIGS22WC37RZHRE6GTW3PUVXZJANCNFSM4HMC6V6A
.

Hey yeah happily add kiki again. Basically only kicked him as I was trying to take a little more control. When I got told to stop throwing me toys out the pram I "threw my toys out the pram" Anyway whatever. Water. Bridge. I'll get this all together with you Sunday, if Kieran is there all the better. We'll stage all these changes to master. Delete all the branches, start again with proper branching model and push to master disabled. Sort everything sunday On Fri, 10 May 2019, 14:09 Riiio, <notifications@github.com> wrote: > Assigned #86 <https://github.com/Squatnet/ArduinoStuff/issues/86> to > @Squatnet <https://github.com/Squatnet>. > > — > You are receiving this because you were assigned. > Reply to this email directly, view it on GitHub > <https://github.com/Squatnet/ArduinoStuff/issues/86#event-2333070696>, or mute > the thread > <https://github.com/notifications/unsubscribe-auth/AGIIIGS22WC37RZHRE6GTW3PUVXZJANCNFSM4HMC6V6A> > . >

👍 1

Riolaurenti commented

2019-05-12 10:54:45 +01:00

(Migrated from github.com)

Yo. Sunday Holla when you got time.

Done most of the resort, now just the real big bit.
Comparing the last working version with the current DV2Working branch.

Yo. Sunday Holla when you got time. Done most of the resort, now just the real big bit. Comparing the last working version with the current DV2Working branch.

Squatnet commented

2019-05-12 13:53:48 +01:00

(Migrated from github.com)

Looks pretty good. I'm going to merge it and then make "development" the default branch and master somewhat protected

Rows
Columns

Overhaul #86