search

thenamesdyl / blastar

"Blastar" on Android
MIT License
4 stars 7 forks source link

To make our commit numbers level #2

Closed claywahlstrom closed 6 years ago

claywahlstrom commented 6 years ago

So far, I have been merging your changes into mine and committing to my origin. Despite having the almost exact code, it says I'm 16 commits ahead. Other than that, keep it up! We've pushed through the hard part of setting the classes up so now it should be easier

thenamesdyl commented 6 years ago

What exactly would this merge add? Just seems like spacing stuff

claywahlstrom commented 6 years ago

Yes, there were some automatically generated spaces. I'm not sure if you want to merge our histories together or not...

On Jul 17, 2017 1:35 AM, "Dylan Burton" notifications@github.com wrote:

What exactly would this merge add? Just seems like spacing stuff

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/TheNamesDyl/blastar/pull/2#issuecomment-315695966, or mute the thread https://github.com/notifications/unsubscribe-auth/AcpEtQ0j32FuWsBlrjCzCKVw6QwdMhDjks5sOxzIgaJpZM4OZp2C .

thenamesdyl commented 6 years ago

It looks kinda messy, you can use your command line to clear out the history for the stuff that isnt actually changing the files too much. But yeah, then I'll merge the spaces. I just dont want the change history to be spammed with a bunch of things that add like a couple spaces.

claywahlstrom commented 6 years ago

Sounds good, I'll clean it up tomorrow. Goodnight

On Jul 17, 2017 1:47 AM, "Dylan Burton" notifications@github.com wrote:

It looks kinda messy, you can use your command line to clear out the history for the stuff that isnt actually changing the files too much. But yeah, then I'll merge the spaces. I just dont want the change history to be spammed with a bunch of things that add like a couple spaced.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/TheNamesDyl/blastar/pull/2#issuecomment-315698308, or mute the thread https://github.com/notifications/unsubscribe-auth/AcpEtca22KwqS27HD1Hq3lqEMiTr0JsKks5sOx-bgaJpZM4OZp2C .