search

WuMRC / drive

32 stars 22 forks source link

Z_Logger Conflict #12

Closed ghost closed 10 years ago

ghost commented 10 years ago

@itkwon I'm getting conflicts now as I try to upload my latest code and I'm seeing extra changes. We should coordinate tomorrow.

ghost commented 10 years ago

@itkwon Update: Fixed by creating a fresh sketch configured for my circuit and deleting all of the conflicting local repository changes. I'll use the main Z_Logger function from now on, but I'll coordinate with you to make sure we don't overlap and I don't break any of your changes you find useful.

barrybelmont commented 10 years ago

Git is designed specifically for distributed non-linear editing. I do not want you two working on two different code bases. Please work on the same code with the same circuit. No more reinventing the wheel.

Fork and merge folks.

barrybelmont commented 10 years ago

I'm closing this issue as Dan has not been on the project for awhile.