Allow User to Choose Name

[PullJosh]

Added quick and dirty solution: 1b54b7afbe091d4aa4bc50270e49e5a0eac5d62e

Would love it if someone made a nicer looking one!

[matthewr6]

ew :P

[PullJosh]

I know...

[matthewr6]

Mind committing to complete-rewrite instead?

[PullJosh]

Is that the main thingamabob?

[PullJosh]

I'll commit there once I have a nicer looking one.

[matthewr6]

it's what I'm working on at least

[PullJosh]

Okay.

[an-OK-squirrel]

Darn, you caused a merge conflict now D:

[matthewr6]

wow http://prntscr.com/7m5e6b not bad!

[PullJosh]

Srry... I was gone all day, so I didn't know. :(

[matthewr6]

an-OK, do you use the command line or the gui?

[an-OK-squirrel]

command line. Also, do we need this? You could alway esc then choose it.

[PullJosh]

Gui, but sometimes github for windows, which does the exact same thing as the cmd line (essentially runs commands for you), only it's super user-friendly for git n00bs like me.

[PullJosh]

Wait... You can choose your name with esc? That's awesome! And no, then this isn't necessary.

[matthewr6]

command line is way more powerful :P

[PullJosh]

But way harder. :/

[matthewr6]

git status git add -A git commit -am "message here" git pull origin branch git push origin branch

[PullJosh]

click the sync button

[PullJosh]

But I have an army of actually intelligent people who do all the hard command line stuff for me.

[matthewr6]

cmon PullJosh, you make really cool Scratch things and you say you can only click "Sync", but not type 5 lines?

[an-OK-squirrel]

I don't even know what's happening...

[matthewr6]

lol anyways I should continue working on what I had planned

[PullJosh]

Science, my friend. Science is happening.

(Except I'm not actually going to try cmd line)

[an-OK-squirrel]

[matthewr6]

What editor/theme is that?

[an-OK-squirrel]

notepad++

[matthewr6]

What are you changing atm?

[an-OK-squirrel]

I have this huge problem and all you say is "hat edider is zat?"

[an-OK-squirrel]

I git pulled and got that.

[matthewr6]

From what branch?

[an-OK-squirrel]

complete-rewrite.

[matthewr6]

Are you sure? Try again :L

[PullJosh]

What are all the branches for anyway?

[matthewr6]

complete-rewrite is my testing stuff, the master is stuff I don't want to touch quite yet in case I break everything

[matthewr6]

should probably merge soon though

[an-OK-squirrel]

I get: error: you need to resolve you conflict before you do that

[PullJosh]

And runaway? What is that?

[matthewr6]

Do a rebase or reset

[an-OK-squirrel]

https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/

[an-OK-squirrel]

i figured it out, now I have to do it

[an-OK-squirrel]

Should be done!

[an-OK-squirrel]

I fixed da conflicts and they popped up again. AHH

[matthewr6]

maybe you need a break? :P I have to go soon to eat.

[an-OK-squirrel]

I doubt it.

[matthewr6]

For some reason tampermonkey doesn't like to update my scripts

[an-OK-squirrel]

AHHH ALL THE PROBLEMS