#a header is when you point at a specific commit and yell THIS IS THE ONE I WANNA LOOK AT to github

[aseplant]

This is more for prev, but I'll add on here in case it helps OP too.

Branching on Github is actually a lot like it sounds. Let's say we're originally on "main" (which is the branch most Github repositories start from*, and is generally considered the source of truth). We decide to branch off, and create a new branch called "my-branch". Main and my-branch will share the same history up until whatever point you decided to split at; after that, whatever work you commit to my-branch will not show up on main, and vice versa.

(*Older Github repositories started from "master" instead of "main". You'll still see this used in a lot of online guides.)

Branching is standard practice in most team settings because you don't want a lot of people editing the same files at a time. Some people push half-finished or buggy work to Github, and this can cause real messes for other people! So instead everyone isolates their own changes, and when they're pretty sure everything is working they merge their branch back into main, and it becomes a part of the new source of truth.

Github is actually pretty smart about merging. Let's say you edited lines 200-300 in a file, and while you were off on your own branch your coworker edited the same file on main. As long as they didn't touch lines 200-300, Github will assume your edits are the ones that should be preserved! (If they did touch lines 200-300, Github has no clear way of deciding who should win, and this is how we get merge conflicts. Usually a human has to go and tell Github which version to keep. Sometimes humans are stupid and tell Github the wrong thing.)

One final thing you might see people talk about is "rebasing", which is when you rewrite your history to match another branch's. Some people like this because it's cleaner. (Contrast this to merging, where both branches keep their histories.)

Can someone explain to me in like five seconds how to use git, assuming that I know basic shit about coding/command line/whatever but don't know any of the specific terminology related to git. Like every tutorial online is at the same time both over my head and also vastly too basic. Just like. Tell me what it is.

Uh. First tell me its ontology. Is it a program, a standard, a language...? I know that it's for version control. Suppose I wanted to do version control at a piece of code. What do I do. What buttons do I press, on my computer? Tell me these things.

[akakeiiji]

request! headcanons for when the reader surprises her bf by showing up (at a match? at school? at work? at the cafe? your choice) after a LOONG time of not meeting each other due to LDR or other commitments for Oikawa, Bokuto, Iwa and Akaashi!! thank you in advanced :)

I’VE BEEN SO BUSY LATELY 🥺🥺 I miss writing sm, my modules are still kicking my ass huhu

Anywayy, I made a bunch of headers (or dividers? idk what you call them??) instead of listening to my teacher during my zoom meetings 😌✌️ Are they alright? Or do you guys prefer the previous format? 

It would happen right before a really big match, as per usual he was surrounded by a gaggle of excited fans trying to get his autograph or get a photo with him, he almost didn’t notice the familiar figure watching just a few feet away

Oikawa would freeze the moment he locked eyes with you and he’d gasp so loudly and so dramatically

He’d drop whatever he was holding, he didn’t care if it was his phone, his drink, it didn’t matter since he needed his arms free to wrap you in his arms

He’d run over to you in record speed, yelling out your name excitedly, basically pushing past the crowd of people surrounding him

He would honestly start tearing up, he was so excited for this match and all he wanted was for you to be there and now you were!!

“Oh my god, (Y/N)! Why didn’t you tell me anything??”

He would not be able to separate himself from you, you two were probably just standing in the middle of the crowded corridor hugging each other for who knows how long despite all the people that were trying to pass by

But again, Tooru didn’t care, why should he when he finally has you in his arms again

He would pepper your entire face with kisses, making you grow bright red but you loved it of course because who wouldn’t??

He was 5000x more hyped for that match now that he knew you were watching up at the stands, cheering him on

Needless to say he completely destroyed his opponent

He was just walking around the main area of the venue after his game, browsing for t-shirts with cheesy lines about being the ace and such

He’d see you out of the corner of his eye and be like “Oh, it’s (Y/N).” and continue walking by before doing the most dramatic double take while screaming “OH MY GOD, IT’S (Y/N)!”

Everyone in the general vicinity just froze and whipped their heads towards you two but of course, this goes unnoticed by either of you as Bokuto basically sonics his way towards you, still screaming your name excitedly

He’d immediately scoop you up with his herculean arms and twirl you around, asking a million questions

“WHEN DID YOU GET HERE? WHY DIDN’T YOU CALL ME?? DID YOU WATCH THE GAME? HOW HAVE YOU GOTTEN EVEN MORE BEAUTIFUL—”

He only really stops yelling when you two get to properly hug, he’d bury his face on the top of your head, kissing it slightly and taking in the scent of your shampoo which he didn’t realize he missed so much

You’re going to have to pry yourself off of him because he physically cannot let go of you

He’s also going to cling next to you for the rest of the day, his hand will always be intertwined with yours or at the small of your back

He just got out of the most boring lecture in the entire world, he was practically half asleep as he dragged himself out of the building

The only thing keeping him conscious was the fact that he was in a call with you at the moment, ranting all about his classes, about Oikawa, and about how much he missed you

“I’m literally so sleepy right now, you should see how I look right now.”

“I think you still look handsome though, maybe even more so than usual.”

“What?”

He’d honestly think you were joking at first, he’d just chuckle and go on with the conversation

Even when your voice started to sound louder and louder, and started to echo slightly, he still didn’t realize that you were standing right behind him until you tapped him on his shoulder

His jaw would immediately drop and no words would escape his mouth as he struggled to comprehend what was happening

His brain would basically short circuit, please save him

Once he finally realized what was going one, he immediately cupped your face with his hands and kissed you deeply

After catching up and all that sweet lovey-dovey stuff, he’d actually start chastising you

“You should have told me you were coming, I could have picked you up at the airport. What if you got lost? What if something happened to you—”

He just can’t suppress his protective motherly instinct, especially when you’re involved

It was early in the morning and Akaashi had a class to attend later on in the day so he thought he’d do some work in his favorite cafe to kill some time

You two used to love having dates at that cafe, you two always stayed at this one specific table by the window so he always made a point to sit there when he could

He ordered his usual drink and went to the table to find someone already sitting there, staring right at him with a giddy little grin on their face

He’d just freeze mid-step, eyes widening into saucers as he stared at you

He was never a morning person and he had -3 hours of sleep that night so he honestly just thought he was hallucinating

Is that (Y/N)? No, it can’t be, they would have told me if they were coming. But they’re sitting right there, what the fuc—

He’d stand there for a few seconds just arguing internally with himself as his brain started to put two and two together

His face would break into a rare ear to ear smile as he ran over to you

As he got closer and closer to you, the butterflies in his stomach that he always felt near the beginning of your relationship returned once more

He honestly wouldn’t believe that you were actually there until you threw your arms around him, pressing kisses all over his face

He’d immediately press his lips against yours and kiss you in a way he never did before, as if he was making up for all the times he couldn’t when you were apart

He would usually never do this in public but he could hardly care now that you were finally here

[raendown]

Pairing: MadaraTobirama Chapter: 12/18 Word count: 2307 Summary: When Tobirama is exiled from the Senju clan without warning, without even the chance to plead his case, it feels like his life is over. What does he have to live for now without his older brother to believe in him? Captured by the Uchiha in his moment of weakness, Tobirama slowly learns to live again with the last people on earth he would have ever expected to care for - or to fall in love with.

Follow the link or read it under the cut!

KO-FI and commission info in the blog header!

Chapter 12

Waking up with Madara wasn’t half as embarrassing as when Izuna found them and threw himself across their legs like an asshole, snickering and yelling something about a family group hug. Madara and Tobirama made a team effort to beat him back off the mattress, at which point Madara hauled himself up as well to chase his brother around the house while Tobirama flopped back down on his bed to catch the lingering warmth of their embrace.

He was going to have to figure out what the hell was going on with his emotions sooner or later but, like in all things of this category, he was set firmly on the ‘later’ option. Emotions had never been the easiest thing for him to delve in to but now it felt as though each step forward he made towards healing was accompanied with his slowly recovering heart pulling away and cowering under the covers, afraid of making progress when he knew damn well it would only leave him vulnerable again. It was, he had discovered, incredibly frustrating to be so divided within himself. His mind may have finally accepted the idea of moving on, his head trusted the Uchiha – Madara and Izuna specifically – but his heart was wary, terrified of going through the same hurt all over again.

Fool him once and apparently he started looking for fools around every corner.

Breakfast that morning was mostly filled with bickering to start, the two brothers snipping back and forth at one another in full-on sibling mode, tossing salt in to each other’s bowls, kicking each other’s legs under the table. They stopped only when Izuna accidentally kicked Tobirama’s knee instead and earned them both a level stare that jerked both of their spines upright. Tobirama went back to eating his porridge with a deceptive air of calm that they knew very well could snap at a moment’s notice if they disturbed him like that again. Not wanting to risk his temper before at least one full cup of tea, they did the same.

It was after they all finished eating and the dishes had been piled lazily in the sink that Tobirama was delivered the latest shocking news in his ever changing life. He could tell something was up by the way Madara kept peeking at him from the corner of one eye but he let it rest until the man cleared his throat and opened the subject on his own, inviting Tobirama in to his study with an apprehension that spoke of uncertainty. Whatever the news was he didn’t look overly positive that Tobirama would like it. Thoughts already struggling not to slide down that familiar dark slope, Tobirama followed him with a tight chest.

He was surprised to see Madara place a single scroll on his uncharacteristically clean desk as soon as they both sat down in his office. When he reached for it, however, Madara kept his hand over it and chewed on his bottom lip, eyes darting from side to side with obvious anxiety, nervous for some reason about what he had to say.  

“I was angry that things had to be so difficult for you,” came the first attempt at explanation. “Nothing more than this has been decided. We’ve written a few more times than this but I’m being vague until you can help decide where to go forward from here.” Then he nodded decisively and pushed the scroll forward.

Even more curious now, Tobirama gently unrolled it and let his eyes skim through the contents quickly. When he was done he went back and read it through again, then very carefully set it down lest his shaking fingers drop it unintentionally.

“Peace,” he whispered.

“A ceasefire,” Madara corrected him hurriedly. “At the moment, anyway. It’s not an alliance right now. It won’t be anything you don’t want it to be.”

“You did this for me?” he couldn’t seem to lift his eyes away from the scroll, the words hidden from him now that they were rolled up again yet imprinted on his memory in such a way he knew he would never forget them. He could easily recognize both the original hand that had penned the letter and the hand that had scribbled a heartfelt, tear-stained response down below, though it was taking a few moments for the reality of what he had read to settle it. It was hard to believe.

Madara huffed as though with great offense. “I have more important things to think about than just you.”

From the way he didn’t quite let their eyes meet Tobirama deduced that statement was only half true but he stuck a mental pin in that train of thought to save it for another time. Right now he already had something mind-bending to focus on. Like the fact that the hostilities between the two infamous rival clans might finally be seeing an end of sorts after countless generations and it was all because Madara had seen how hard the current situation was for him.

Lives saved. Children allowed to grow. Families kept together without being torn apart by untimely and gruesome deaths. All because Madara had seen his struggle and found a way to make things easier for him.

“You said that the two of you had communicated further?” he ventured. Almost immediately there was a handful of other scrolls on the desk.

“He’s proposed half a dozen other things of course but I’ve been keeping my answers vague without committing to anything just yet. I didn’t know what all you would approve of and I thought perhaps you might have a few insights to share besides. You would know his thought patterns better than I would. What’s the point of having insider information if I don’t use it, right?”

“Right.”

“Not that–! I didn’t meant to say–!”

“Hush.” Tobirama rolled his eyes with a small smile. “I understood what you meant.” After all the things this man had done for him there wasn’t a single part of him left that could believe Madara had been grooming him as a convert of some sort. Though it had taken a great deal of time, he had finally come to accept that he meant more to the people here than a sink of information on their oldest enemy. Just as he had been thinking earlier, he trusted this man, knew him better than to believe such things.

It was amusing to watch Madara deflate with such heavy relief. “Oh. Good then. Well, if you wanted to read through these you are very welcome to. He’s covered pretty much every option from a more formal peace treaty all the way up to building that ridiculous village he and I used to talk about.”

“The village. He never…he never did stop talking about the village.” Tobirama reached out to run his fingers over the rolls of parchment, wondering which one of them contained those familiar dreams he had heard about so often, indulging or ignoring them as his mood dictated. After all the times he’d listened to it he could probably recite the speech by heart.

“Really? Huh. I knew he kept asking but I just thought he was stubborn.”

“Bull-headed, I would say.”

Madara snorted. “Now that’s a word I think would apply more to you.” Tobirama resisted sticking out his tongue but it was a close thing.

“This village, though. Wasn’t that your dream too?”

Oddly enough, Madara shifted uncomfortably and looked away before answering.

“I dreamed about that a long time ago,” he agreed, avoiding the real question.

“Yes,” Tobirama pressed, “but do you still?”

“Maybe? I don’t know, to be honest. The idea was to create a place where I could protect the last of my little brothers but I feel like I’m strong enough to do that myself now. Doubly so with your strength added between us. What do I need a village for now?”

“To protect everyone else’s little brothers,” Tobirama suggested quietly.

He shrugged when Madara gave him a long look. He could practically hear Hashirama’s voice in his head and it was messing with his own morality system in a strange way, making him think about things he normally wouldn’t consider. Actually it was sort of annoying. If this was what it was like to have more of a conscience then he didn’t like it very much; it just felt like guilt before he’d even done anything and he sort of resented that. The village had never been something he believed in. Normally his reaction whenever Hashirama started going off about it was to roll his eyes and repeat that the chances of both clans agreeing to peace was so slim they were better of discarding the whole idea to never bore him with it again.

Sitting here with Madara now, staring across the desk at the roll of parchment sitting innocently as though it contained anything less than the beginning of momentous events, he wondered if he might have been wrong all this time. Could there have been a way to convince Madara if he had never come here? It was a pointless tangent to think about because he had come here and they would never know how things could have been otherwise but it gave him more to think about. All the arguments Hashirama had made in favor of peace over the years came rushing back for him to turn them over and over again, giving them proper consideration for perhaps the first time.

Both of them were quiet for a while, meeting each other’s eyes and looking away to disappear back in to their own thoughts. In the silence between them Izuna could be heard puttering around somewhere else and singing to himself in a terribly off-key voice, cutting through the tension even without realizing he was doing so. Finally it was Madara who spoke up again.

“We won’t agree to anything that would make you more uncomfortable,” he said. Tobirama twisted his mouth to one side with indecision.

“But you cannot consider my comfort above what is best for the entire clan. Don’t the children deserve somewhere safe to grow up? Not everyone has a brother as strong as you, after all.” He watched Madara shift between preening over the compliment and frowning over the reality of the situation.

“If we build a village with the Senju”–his voice stayed low, soothing, the sort of voice one might use to keep a wild animal calm–“you would have to see him again. And all of them.”

Tobirama sighed. “Not necessarily. He’ll hardly expect to get to know every single member of the clan and his chakra is fairly hard to miss; he’s rather easy to avoid and even easier if I have an entire village to maneuver around him. Without me the Senju are weakened by their lack of natural sensors. If I put in a little effort I’m sure I could disappear in to the ranks and never interact with any of them if I so desired. All I’d have to do is stay within the boundaries of my own people.” With a cock of the head he set his eyes upwards to look out the window and give himself a moment to think. It was such a clear morning, the sort of morning he had often taken advantage of to serve breakfast on the back porch so Hashirama could point out what birds were nesting in the bushes of their garden.

As much as the man had hurt him, Tobirama couldn’t bring himself to believe that Hashirama had ever had a single bad intention. Their beliefs and their morals had never matched exactly but each of them had always done what they believed was best for their clan. It hurt, of course it did, to know that Hashirama considered it best to have him gone but one upset between the two of them could not convince him to wish any ill on the other. Hashirama deserved to have those mornings with whoever he chose to keep by his side.

Just as Tobirama himself deserved the same. Watching a flock of birds wheel and turn, he tried to imagine what a village like that would look like, how peaceful it would be to serve breakfast on the back porch with Madara and know that no one could ever take what was precious to him again.

“Write him back,” he murmured. “And tell him he can have his village. Tell him to invite any clan he sees fit and that we will do the same. My past should not inhibit other people’s futures.”

“If you are absolutely sure…”

“Yes, I am.” Tobirama nodded, breathing deep. He wasn’t sure the pain of what happened would ever go away but it was lessening, softening, and he had only the man before him to thank for that. Madara eyed him for a few moments to be sure he wasn’t hiding his feelings or anything and then he nodded too.

“Alright. Well. Get out of here, then. I’ve got a lot to do today and all of it is math. Ugh.” One hand gestured to the other scrolls all pushes off to the far side of his desk where he always left the clan accounts as the last task to complete.

Not even bothering to hide his amusement, Tobirama gratefully allowed the emotional moment to slide away in favor of lifting one eyebrow and pointing out, “You’re good at math.”

“That doesn’t mean I like it.”

“I suppose. Perhaps if you asked very nicely I might be enticed to help you.”

A scroll filled with monthly accounts hit him in the chest a moment later but it wasn’t followed by any insults and Tobirama figured that was about as nice as he could expect Madara to be.