search

coelacant1 / OpenDACT

Open Source Delta Automatic Calibration Tool
https://forum.seemecnc.com/forum/viewtopic.php?f=36&t=8698&sid=fee0abe0878b65d8c2f023d4b06b0775
GNU Affero General Public License v3.0
53 stars 21 forks source link

Catching up! #4

Closed geneb closed 8 years ago

geneb commented 8 years ago

On Thu, 8 Oct 2015, Steven T. Rowland wrote:

Merged #4.

This is going to sound really dumb, but did the merge move your code to my repo? I'm still a complete derp when it comes to git. :)

tnx!

g.

Proud owner of F-15C 80-0007 http://www.f15sim.com - The only one of its kind. http://www.diy-cockpits.org/coll - Go Collimated or Go Home. Some people collect things for a hobby. Geeks collect hobbies.

ScarletDME - The red hot Data Management Environment A Multi-Value database for the masses, not the classes. http://scarlet.deltasoft.com - Get it today!

coelacant2 commented 8 years ago

I'm fairly sure that it just moved your commits to the master branch. However, I don't have much experience with this either lol

geneb commented 8 years ago

On Thu, 8 Oct 2015, Steven T. Rowland wrote:

I'm fairly sure that it just moved your commits to the master branch. However, I don't have much experience with this either lol

Well crap. :) I hadn't made any changes since the request I'd originally made. I'm hoping we didn't accidentally break something. :)

g.

Proud owner of F-15C 80-0007 http://www.f15sim.com - The only one of its kind. http://www.diy-cockpits.org/coll - Go Collimated or Go Home. Some people collect things for a hobby. Geeks collect hobbies.

ScarletDME - The red hot Data Management Environment A Multi-Value database for the masses, not the classes. http://scarlet.deltasoft.com - Get it today!

coelacant2 commented 8 years ago

I hope not! It seems as though your fork did get overwritten, I will see if I can revert it and we will go from there!

coelacant2 commented 8 years ago

I would open up your local version - if that also wasn't overwritten - and try to re-commit your changes to the branch.

geneb commented 8 years ago

On Thu, 8 Oct 2015, Steven T. Rowland wrote:

I hope not! It seems as though your fork did get overwritten, I will see if I can revert it and we will go from there!

Well no, I WANTED my fork to get over-written! I wanted to get all your changes merged back into the fork I'd made. :)

g.

Reply to this email directly or view it on GitHub: https://github.com/RollieRowland/OpenDACT/pull/4#issuecomment-146678293

Proud owner of F-15C 80-0007 http://www.f15sim.com - The only one of its kind. http://www.diy-cockpits.org/coll - Go Collimated or Go Home. Some people collect things for a hobby. Geeks collect hobbies.

ScarletDME - The red hot Data Management Environment A Multi-Value database for the masses, not the classes. http://scarlet.deltasoft.com - Get it today!

geneb commented 8 years ago

On Thu, 8 Oct 2015, Steven T. Rowland wrote:

I would open up your local version - if that also wasn't overwritten - and try to re-commit your changes to the branch.

Well that's just it, I haven't committed anything since the last time we synced up a couple of weeks ago.

g.

Proud owner of F-15C 80-0007 http://www.f15sim.com - The only one of its kind. http://www.diy-cockpits.org/coll - Go Collimated or Go Home. Some people collect things for a hobby. Geeks collect hobbies.

ScarletDME - The red hot Data Management Environment A Multi-Value database for the masses, not the classes. http://scarlet.deltasoft.com - Get it today!

coelacant2 commented 8 years ago

Oh, I think that I understand your problem now. I would recommend pulling the latest master branch and then recommit those changes to your fork.