search

LakeEffectRobotics / LakeEffectScoutingApp

Scouting app for FIRST Robotics Competition team Lake Effect Robotics
https://play.google.com/store/apps/details?id=ca.lakeeffect.scoutingapp
Other
7 stars 10 forks source link

Merge #24

Closed gregk27 closed 6 years ago

gregk27 commented 6 years ago

Implemented recursive saving code

Started work on new layouts.

ajayyy commented 6 years ago

Merge conflicts yay

gbuckholtz commented 6 years ago

windiff is your friend

On Feb 10, 2018, at 11:59 AM, Ajay Ramachandran notifications@github.com wrote:

Merge conflicts yay

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/LakeEffectRobotics/LakeEffectScoutingApp/pull/24#issuecomment-364671903, or mute the thread https://github.com/notifications/unsubscribe-auth/ABKRlBm8E_l4tTSyPadYrFyfX_Fp5nLlks5tTcr2gaJpZM4SA-yR.

gbuckholtz commented 6 years ago

hmm. I did a merge locally with pr24 and master and there weren't problems

ajayyy commented 6 years ago

I think it's just the fact that one of the commits was accidentally committed to master and the fork, will fix it now.

ajayyy commented 6 years ago

Turns out merge commits were disabled and only rebase and merge was enabled