luvcraft - Tumblr blog

luvcraft · 9 months ago

Text

If you're afraid of the git, remember the SourceTree rainbow

I'm confused when I see people talk about how complicated and overwhelming Git is; I think it's great, and generally really straightforward.

So I thought maybe I'd talk about how I use Git, and see if it helps others understand it better.

There are going to be exceptions to pretty much everything I say here, but what I say here is "true for the most part".

First and foremost, install SourceTree (https://www.sourcetreeapp.com/), and set the file windows to "tree view". SourceTree is a free GUI for Git, and it's available on both Mac and Windows. Because I use it I never have to use command-line git, which I suspect is what overwhelms a lot of people.

To make a new git project, go to github.com and create a new project, and it'll give you a URL that points to the project. Copy that URL, go into SourceTree, and tell it to "clone" a project from a URL. Give it that URL, and tell it where on your computer you want to put the project, and you should be all set.

Although Git is primarily designed for programming, it can be used for pretty much any kind of creative project you do on a computer; the only caveat is that you can't have a single file larger than 100mb. But you can have over 100mb spread out over multiple files.

I'm gonna talk about git in "levels", from the simplest use case to more complicated use cases. Once you've read a high enough level to do what you want to do with it, you're welcome to bail out.

Level 1: Backup

At it's most basic, git is an easy way to do frequent backups. If you've been making stuff on a computer for a while, then you probably have a normal routine of backing up what you're working on in case something terrible happens.

There are three steps to backing up data via git: stage, commit, and push.

Staging is where you choose which files you want to backup. Typically this is everything in the folder you're working in. In the "File Status" view in SourceTree, the screen is split into "Staged Files" and "Unstaged Files". Clicking the checkbox next to an unstaged file moves it to staged, and vice versa. Once you've staged the files you want to backup, you (optionally) type a little note in the note field at the bottom, and click "commit".

Commiting means you're telling the part of git that runs on your computer to backup all the staged files. If "push changes immediately" at the very bottom is checked, then SourceTree will automatically push when you commit. Otherwise you have to hit the big "push" button at the top to push.

Pushing just sends your commits from your computer to the server. Once you've pushed your commit, you're all backed up, and if your computer explodes (or you just want to access your project from a different computer), you can install SourceTree on your new computer, "clone" that same URL from github, and then "pull" (the opposite of "push") to bring your project down from the server to your computer.

If all you want to do is have an easy way to regularly backup a project, then that's it! But if you wanna do more stuff, then read on.

Level 2: History

The next useful part of git is history; if you've ever looked at the history feature of Google Docs, then you have an idea what to expect.

After you've made a few commits, you'll see a list of commits in SourceTree, with your little notes next to them. If you click on one of these commits, it'll show you everything you changed in that commit. For text-based files, it'll even show you changes you made to individual lines of text.

If you've made a change and decide later that you don't like it and want to go back, you can do that via History. If it's just a few lines of a text-based file, you can highlight and copy the old lines and paste them into the current file. If you want to reset a whole file, then you can go to a commit before you changed it, right-click on it, and choose "reset to this commit".

Level 3: Branches

History is good for when you change your mind about something after the fact. If you know in advance that an idea may or may not work, or you want to do something risky without any of the risk, then you can use branches.

To make a branch, just click on "branch" at the top, and name your branch after whatever crazy thing you're gonna try in your branch. Then continue to work as normal, and everything will go in that new branch instead of the "main" branch. You can switch back and forth at any time by just double-clicking the branch you want in the "branches" list (just be sure to commit anything you want to keep before switching).

If you want to copy the changes to a single file from one branch to another, you can right-click on it and choose "reset to this commit", just like you did in the History section above. If you want to combine everything in two branches together, then keep reading.

Level 4: Merging

If you want to mix all of the changes and new stuff from one branch into another branch, that's called "merging". Don't use the big "merge" button next to the "branch" button; it's confusing and weird. Instead, in the branches list, right-click on the branch you want to merge into your current branch, and choose "merge into current branch", and then check "create merge even if fast forward is possible" in the dialog that appears and hit "OK".

In most cases, the two commits will just nicely merge together.

If you've been switching back and forth between them, and making different changes to the same files in both, then it might tell you there's a "conflict" and it can't figure out how to merge the two versions of that particular file. In this case, just right-click on the file in staging, and choose either "resolve using mine" (i.e. the version in the current commit) or "resolve using theirs" (i.e. the version in the other commit).

If the file you're merging different versions of is a text file, then git will do its best to combine the changes you've made to it, but you should double check to make sure they look good. If git can't figure out how to merge a text file, then it'll show you specifically where it's having trouble, and you can either do the "resolve using mine / theirs" method above, or choose "resolve using external merge tool", at which point it'll open up a separate program (if you have one installed) that you can use to manually fix the conflicts.

If you do use an external merge tool, keep in mind that it might leave behind extra files with extensions like ".orig", and you can just delete those.

Level 5: Pull Requests

OK! Everything so far has pretty much been about using git solo. Pull requests are about using git on a team. They're primarily used for bug fixes, or adding new features, and here's how they work. If you want to fix a bug, or add a new feature, you make a new branch with a name like "fix-for-bug-x" or "feature-y", and you work on your bug / feature in the branch. When you're ready to add your bugfix / feature to the main project you make a pull request.

If you've pushed a commit of your branch in the last hour or so, and you go to your project's github, you'll see a handy notification at the top asking if you want to make a pull request of your branch. Go ahead and do that, and then type in a good title for your request, and a description of what you did, and then hit the button to create it.

Then ask your team to take a look at it, and they'll see a nice detailed breakdown of everything you changed. If they have questions or comments about individual lines of what you've written they can leave notes, and then if you need to you can make and push changes to the branch and it'll automatically update the pull request.

Once everyone's happy with the pull request, there's a handy button in the github UI to merge it, and then it'll give you the option to delete the branch once it's merged (which I recommend for things like bug fix branches which you're never going to make any more changes to).

And that's everything you need to know!

There's a lot of other, more complicated stuff that git can do, but this is everything that someone would typically need to know to use it.

I realize this is a terrifying wall of text, but hopefully you bailed out after the section that taught you what you needed to know, and feel less overwhelmed by git.

#github #git

0 notes

luvcraft · 9 months ago

Text

Little Red Riding Hood

COLD OPEN

INTERIOR – LITTLE GIRL’S BEDROOM – NIGHT

GIRL lies in bed. She is 4 years old. MOTHER is sitting next to the bed reading “Little Red Riding Hood” to the girl. FATHER leans in the doorway, smiling. A small DOG lies at the foot of the bed.

Mother: Once upon a time, there was a girl named Little Red Riding Hood…

INTERIOR – MANSION LIVING ROOM – DAY

MOTHER, FATHER, and GIRL are sitting together in the room. Dog sits on the floor nearby.

Mother: We have some wonderful news for you, darling. You’re going to be a big sister!

Girl beams with joy, and then starts giggling. Mother and Father smile at her and at each other. Girl’s giggling turns into laughter, and then into maniacal laughter. Mother and Father stop smiling. Laughing and screaming, the girl rips open the couch cushion she’s sitting on, then backs away from the couch, spins around, and breaks a vase on a table. Dog starts barking. Girl starts tearing at the drapes when Father grabs her by the shoulders and shouts at her.

Father: That’s ENOUGH!!

Still holding her he turns to mother.

Father: This is even worse than her last fit!

INTERIOR – SCHOOL PRINCIPAL’S OFFICE – DAY

Girl sits between her parents facing the PRINCIPAL. Mother is holding BABY BROTHER. Girl has a black eye, and there are some small blood stains on her shirt.

Father: Expulsion? From Kindergarten? This is the best school in the city. Surely there’s some way I can –

Principal: I’m very sorry, and I appreciate your generosity, but it’s for the good of the other children.

INTERIOR – NURSERY – DAY

Baby brother is in his crib, and girl is standing on a stool looking over it, smiling at him. Baby is smiling back. They are playing peek-a-boo together. Girl tickles Baby and he laughs, and she laughs back, but there’s something off about her laugh.

Baby kicks as girl tickles him, and she grabs his ankles and lifts him up. Baby cries, but girl shushes him and smiles at him and giggles, and soon baby is looking back at her and smiling, too. Girl starts to sing to baby.

Girl: (singing) Baby bat! Doot doo! Doot doo da-doo!

Girl continues to sing this repeatedly as she swings baby over the side of the crib. She dances him around the room like this, out onto the nursery’s balcony. She briefly holds him over the balcony railing, continuing to sing, then whisks him back into the house. They dance out of the nursery, into the upstairs hallway. Girl is holding baby over the bannister when Mother sees her and screams.

Mother: What are you doing??

Startled, girl drops baby for a second, then grabs him again before he falls. Baby starts to cry as girl sets him down.

Girl: We were playing –

Mother runs over and scoops up baby.

Mother: (to girl) Go to your room! And don’t ever play with your brother like that again, do you hear me?

INTERIOR – GIRL’S BEDROOM – NIGHT

Girl is sitting in bed and has been cutting her arms with a pair of scissors. Dog is lying in his usual spot at the foot of the bed. There’s a knock at the door, and girl hides her arms and the scissors under the covers. Mother comes in, carrying a sandwich on a plate.

Mother: Are you hungry, sweetheart?

Girl: No thank you.

Mother: Do you remember why I sent you to your room?

Girl: Yes. I’m sorry. I won’t play with him like that ever again.

Mother: Thank you, honey. I want you to be more careful with him from now on.

Mother turns to go.

Girl: Mom? Will you read me “Little Red Riding Hood”?

Mother turns back and smiles at girl. She takes the book from the bookshelf, and sits down in the bedside chair. She shouts, and then jumps back up again, pulling a thumbtack out of her buttock. Girl laughs and laughs.

Mother: Is this your idea of a joke? I have HAD IT with you!

Mother throws the book on the floor, glares at girl, and leaves the room. On the way out she touches the sandwich as if considering taking it with her to punish the girl, but then thinks better of it and leaves the sandwich and slams the door.

INTERIOR – MANSION LIVING ROOM – DAY

A couple of years have passed.

Girl is sitting at a table with TUTOR, working on schoolwork. Mother is sitting on the couch with the dog. Baby brother, now a toddler, plays with toys on the floor nearby.

Father comes into the room, carrying a charred briefcase. He slams it down on the table in front of the girl and yells at her.

Father: No more, you hear me? No more!

Mother: What happened?

Father: My briefcase exploded in the middle of a meeting. In the middle of THE meeting! I’ve been working on this for months! And now…

He opens the briefcase and dumps charred bits of paper on the table in front of the girl.

The girl starts giggling.

Father: Oh no, none of that! Go to your room right now!

Girl marches off to her room, giggling all the way.

Father collapses on the couch with his head in his hands.

Mother: (to Tutor) I don’t think we’ll be needing you any more today.

INTERIOR – UPSTAIRS HALLWAY – NIGHT

Mother is standing at girl’s door with a sandwich on a plate. She sighs, composes herself, and then knocks on the door before opening it. She begins to step through, and sees that girl has KILLED the family dog with her scissors. Girl smiles at Mother. Mother screams and drops the plate.

INTERIOR – PSYCHIATRIST’S OFFICE – DAY

DOCTOR sits behind his desk. Across from him sit Mother, Father, and toddler Brother. Girl is not in the room. Mother and father look visibly shaken and exhausted. They are signing paperwork on Doctor’s desk.

Doctor: You’re making the right decision, and I can assure you she’ll receive the best possible care here, and should be back home good as new before you know it!

EXTERIOR – ASYLUM YARD – DAY

Mother and father hug girl. Girl looks a little sedated.

Mother: I’ll come visit every week, sweetheart, and your doctor says that once your condition improves, you can even come home for a couple of days every month.

Girl smiles weakly at her parents and nods.

INTERIOR – MANSION FOYER – DAY

Mother is crouched at the foot of the stairs, cradling toddler Brother. Brother is crying and bloodied. Girl is nearby and Mother glares at her.

Mother: No more home visits! You stay at that hospital until you get all better!

MONTAGE – GIRL IN ASYLUM

Montage of scenes of girl in asylum, first getting into fights and cutting herself, and then being medicated daily, and gradually calming down and eventually shuffling through her days in a stupor. Over the course of the montage she ages from 8 years old to 12 years old. At the end of the montage, she’s sitting on her bed and mother is sitting next to her, talking.

Mother: He says you’re getting so much better, and can start coming home for visits again soon.

No response. Girl stares blankly ahead.

Mother: I’d really like that, wouldn’t you?

Girl continues to stare. There’s a knock at the door, and an ORDERLY enters with a pill cup.

Orderly: Nightcap time.

Orderly gives girl her pills, and girl swallows them, then turns to mother and smiles. A warm, genuine smile this time. If a little drugged.

Girl: I would like that.

Mother squeezes girl’s hand and turns to leave.

Girl: Mom? I know this sounds hokey, but can you tell me Little Red Riding Hood before you go?

Mother turns and smiles at girl.

Mother: Sure, honey.

Before sitting down in the bedside chair, mother checks it for thumbtacks. Girl sees her doing so, and mother looks embarrassed for a moment and then gives girl a wink and sits down.

Mother: (reciting from memory) Once upon a time there was a girl named Little Red Riding Hood.

As mother recites, her recitation is V.O. over the following scenes.

INTERIOR – MOVIE THEATER – NIGHT

Mother, Father, and now-8-year-old brother sit together in the theater watching a movie.

Back in the hospital room, mother smooths girl’s hair as girl lies in bed.

Mother V.O.: And the wolf said “come in!” in his best grandmother voice, and Little Red Riding Hood came in.

INTERIOR – ALLEY – NIGHT

Close-up of brother’s face, staring wide-eyed in horror, as muzzle flashes reflect in his eyes.

Mother V.O.: “Grandmother, what big eyes you have!” And the wolf said “all the better to see you with, my dear!”

Close-up of gun firing.

Mother V.O.: “And grandmother! What big teeth you have!” And the wolf said “all the better to eat you with!” And he leaped out of the bed and chased Little Red Riding Hood around the room…

An EMT puts a blanket around the shoulders of crying brother.

Mother V.O.: but a nearby woodsman heard the commotion and burst in and killed the wolf with his axe. And they all lived happily ever after.

INTERIOR – GIRL’S HOSPITAL ROOM – NIGHT

Girl is sitting on her bed. BUTLER stands in the middle of the room. Behind him in the doorway stand the Doctor and two orderlies.

Girl: We don’t have a butler.

Butler: I’ve known your father for a long time, and he hired me as a butler a few years ago. I kept telling him that “secretary” or “handyman” would be sufficient, but he insisted that “butler” would be a more respectable title. You know how he was.

Girl: …was?

Butler: (for a moment a military bearing asserts itself, that he’s used countless times to inform next-of-kin of soldiers being killed) I regret to inform you that your parents have both been killed. Your brother, fortunately –

Girl sobs, and then begins to giggle. Doctor pushes Butler aside and takes girl’s hands, and looks into her eyes.

Doctor: Remember your breathing. Come on, you can get through this.

Girl takes measured breaths between giggles, which turn into panting, maniacal laughter. Doctor quickly nods at an orderly. Orderly uncaps a hypodermic and injects girl, but she flies into a frenzy, grabs his taser off his belt and jams the contacts into his eyes before pulling the trigger. The orderly screams and reels back, eye sockets bleeding. The other orderly shoves girl onto the bed, and Doctor, Butler, and both orderlies beat a hasty retreat before she can get back on her feet, and slam the door. On the other side of the door, her laughter gradually subsides as the sedative takes effect.

INTERIOR – DOCTOR’S OFFICE – NIGHT

Doctor and Butler are both visibly shaken.

Doctor: I’m so sorry. She has been progressing wonderfully, but after tonight I honestly don’t know how long it will be. She could be fine again tomorrow, or she could be back at square one.

Butler: I understand. This has been a terrible couple of days for all of us. You’ll let me know how she does, though, yes?

Doctor: Yes, of course.

INTERIOR – GIRL’S HOSPITAL ROOM – DAY

Girl groggily wakes up in the morning. Doctor is standing in the doorway of her room.

Doctor: How are you feeling this morning?

No answer.

Doctor: I’m very sorry to hear about your loss.

No answer.

Doctor: But I’m sure you know that your reaction to the news you received last night was totally unacceptable. Choose your next words and actions very carefully. You’re in the home stretch, but I’m very worried that you’re going to relapse and we’ll need to keep you here longer.

Girl: How’s… what’s-his-face? (she points at her eyes with two fingers)

Doctor: Frederick has lost both eyes. You blinded him with a taser during one of your fits last night.

Girl: I feel bad about that… (a little loopy from the sedatives) …but he shouldn’t feel bad… I was only tasing.

Girl starts to giggle. Doctor, both angry at her and afraid of her giggling, slams the door.

Doctor: Longer it is, then.

EXTERIOR – ASYLUM – NIGHT

A storm is raging, and the howl of the storm is accompanied by the sound of alarms. Below the asylum, a group of patients crawl out through a gushing sewer pipe. Among them is the girl.

INTERIOR – MANSION LIVING ROOM – DAY

Butler is on the phone.

Butler: Yes, I see. Well, thank you, and let me know if you have any further news.

He hangs up. Brother enters the room.

Brother: What was that?

Butler: Nothing, young master. Nothing.

MONTAGE – GIRL COMMITTING CRIMES

Montage of girl robbing and stealing on the streets.

During the montage, the girl sees a RED CLOAK with a hood in a storefront window. She smashes the window and takes the cloak, and wears it in all following scenes.

EXTERIOR – ALLEY – NIGHT

Girl is crouched behind a dumpster, rifling through four different stolen purses for cash. She is now in her late teens. There is a noise, and girl turns to see four GANGSTERS walking toward her down the alley. They’re all dressed in cheap suits, so not street thugs, but not full-fledged mafiosos, either. Somewhere in between. She ducks behind a dumpster, but not before being spotted.

Macky (one of the gangsters): What was that?

The gangsters walk over, to find girl huddled behind the dumpster.

Macky: Holy shit! It’s Little Red Riding Hood! You on your way to grandma’s, Little Red Riding Hood?

The other gangsters start to laugh and chant “Little Red Riding Hood”, except the GANG LEADER.

Leader: Cut it, Macky. We’ve got better things to do than roll street kids.

Macky gets closer to girl. He unbuttons his suit jacket to show a pistol tucked into the front of his waistband.

Macky: I got a big bad wolf for you here.

Leader: Macky! Quit it!

Macky: (lunging at girl) Woof!

Macky laughs and returns to the group and they continue down the alley. Girl starts giggling, which becomes peals of laughter. Macky turns around and sees that she’s pointing at him and laughing uproariously. He spins around and walks back to her.

Macky: You think I’m funny??

Leader: Goddammit, Macky!

Macky: (now in girl’s face) You think I’m funny??

Girl, still laughing uncontrollably, holds up a hand like she’s asking Mackey to give her a second, and then suddenly whips his pistol out of his waistband and unloads the entire clip into his torso and head. She continues to pull the trigger, and the gun clicks repeatedly as her laughter winds down, and she ends it with a loud and satisfied:

Girl: Whew!

All the gangsters have their guns drawn and pointed at the girl. There’s a tense moment, and then…

Gang Leader: Holy shit. Well, I told Mackey to lay off. Better he gets it here than when we need him covering our asses.

Gang Leader looks at the pile of purses at girl’s feet.

Gang Leader: So, Little Red Riding Hood, you wanna swipe purses the rest of your life, or you wanna come help us knock over a liquor store?

Girl: Sounds fun!

MONTAGE – GIRL WITH THE GANG

Montage of the gang committing crimes.

INTERIOR – CAR – NIGHT

Leader is in the driver’s seat, girl is in the back seat. Other gangsters are in the car. One has a duffle bag of money on his lap.

Gang Leader: You did good back there, Little Red Riding Hood.

Montage continues.

INTERIOR – GANG’S HIDEOUT – NIGHT

Gangsters and girl are standing around a table piled with cash. Each gangster has an open bottle of champagne in his hand, and they’re all pumping them and shouting:

Gangsters: (in unison) Red Riding Hood! Red Riding Hood!

Girl takes a flourish-y bow.

Montage continues. Their capers are getting bigger. Now when they drive, the girl is riding shotgun.

Montage continues. They’ve hit the big leagues; robbing banks, crushing rival gangs. Now when they drive, the girl is driving.

INTERIOR – GANG’S HIDEOUT – NIGHT

As the montage ends, the gang’s hideout is much nicer than it was at the beginning of the montage; they’ve clearly been doing well for themselves, and owe it all to the girl. They’re even all wearing red suits now to match her cloak.

The girl enters, carrying a rolled-up building blueprint.

Former Gang Leader: What’s the plan, Red Hood?

Girl: Tonight, my boys, we’re gonna heist enough explosives to level this town three times over, and recreate it in our image.

Girl unrolls the blueprint. It’s the floorplan for the Ace Chemicals Plant.

Girl laughs maniacally.

OPENING TITLES: THE BATMAN 2

#fanfic #batman

0 notes