search

johannilsson / android-actionbar

DEPRECATED Android Action Bar Implementation
1.3k stars 564 forks source link

Updated files for new SDK (r14) #40

Closed o2genum closed 13 years ago

rfgamaral commented 13 years ago

Why not a single commit? Git would understand the file was basically renamed (even if it has a couple of changes). And technically, the updated files have nothing to do with the SDK, but the ADT tools.

Please don't take this the wrong way, I agree this should be pushed, I'm just picky that way.

o2genum commented 13 years ago

Oh, sorry. android tool renamed files, but git din't understand it and continued tracking those files. I'm not a pro in git.

rfgamaral commented 13 years ago

Neither am I lol. But what it looks like you did was, deleted the older file and commited, added the new file and commited. What I'm saying is that you could have deleted AND added the new file in a single commit. Since it actually belongs to the same thing, it would make more sense to do it in a single commit.

For instance, my own commit on the same thing: rfgamaral/android-actionbar@7d434b74f6

If you look at the yellow icon, the title says "renamed". Makes more sense to do it this way. But that's ok, I'm just learning Git too...

rfgamaral commented 13 years ago

I realized my own fork didn't fix this problem on the "actionbarexample" project so I fixed it and pushed a new commit. This was automatically added to my previous pull request johannilsson/android-actionbar#39, with the added benefit of a single commit for less confusion.

Maybe you could close this pull request then? Or maybe just leave it be... I just noticed your pull request was on the "master" branch while mine is on the "mimic-native-api" branch.

Or leave this to @johannilsson, he'll know what to do...