drtshock / Potato

If you fork this then you can say you forked a potato.
GNU General Public License v3.0
717 stars 2.56k forks source link

I made you some potatoes. Do you like them? #26

Closed skylarjhdownes closed 10 years ago

drtshock commented 10 years ago

squash your potato

skylarjhdownes commented 10 years ago

No, see, squash aren't tubers at all, they belong to the genus Cucurbita. Although there probably should be an option to mash the potato. Mmm... Mashed potatoes...

caojohnny commented 10 years ago

Nah. Potato likes to be mainstream even if all his friends are different colors.

@jkcclemens Ney. Close.

anna-is-cute commented 10 years ago

git rebase -i HEAD~10 That will squash the commits.

Also, fix formatting. I would prefer the classes be in separate files.

skylarjhdownes commented 10 years ago

Oh, drtshock was talking about rebasing. That makes sense, thanks. Would it make more sense to leave this pull request open or make a new one?

skylarjhdownes commented 10 years ago

Also, if you want me to go be noobtastic somewhere else just tell me. :P

anna-is-cute commented 10 years ago

Pushing to the branch you made the PR on updates the PR.

— Sent from Mailbox for iPhone

On Tue, Dec 3, 2013 at 9:47 PM, skylarjhdownes notifications@github.com wrote:

Also, if you want me to go be noobtastic somewhere else just tell me. :P

Reply to this email directly or view it on GitHub: https://github.com/drtshock/Potato/pull/26#issuecomment-29773508

skylarjhdownes commented 10 years ago

Okies, thanks. Hmm... looking at the network graph, something tells me I didn't do that right. If I understand correctly I ought to be trying to squash the branches into each other, leaving just the master branch behind so as to avoid cluttering up the commit history, correct?

anna-is-cute commented 10 years ago

Squash the master branch of your repo. You squash commits. Then, after the rebase, you should only have one commit in your branch. Push that (you'll have to use --force) and the PR will update.

— Sent from Mailbox for iPhone

On Thu, Dec 5, 2013 at 1:19 PM, skylarjhdownes notifications@github.com wrote:

Okies, thanks. Hmm... looking at the network graph, something tells me I didn't do that right. If I understand correctly I ought to be trying to squash the branches into each other, leaving just the master branch behind so as to avoid cluttering up the commit history, correct?

Reply to this email directly or view it on GitHub: https://github.com/drtshock/Potato/pull/26#issuecomment-29922834

caojohnny commented 10 years ago

@LaxWasHere Huhuah nope. Delete 9d8fded plz

skylarjhdownes commented 10 years ago

That may or may not just be something weird that I did on accident... I'm really not sure. Thanks for not lynching me while I flail around, by the way. I'm trying not to break anything, but I don't think it's working.

anna-is-cute commented 10 years ago

You're not harming anything, so it's fine.

anna-is-cute commented 10 years ago

Inactive. Closing.