#git-tools

[git-codes]

Mastering Git Merge: A Comprehensive Guide to Version Control and Collaboration

Merging in Git plays a key role in version control. It combines changes from different branches into one. A merge allows teams to work on features independently and then bring them together. This process helps keep projects organized.

There are different types of merges in Git. A fast-forward merge happens when there are no changes on the base branch since branching off. In this case, Git simply moves the base branch pointer forward to the latest commit. A three-way merge occurs when the branches have diverged. Git uses the last common commit and the commits from both branches to create a new commit. A squash merge combines all changes into a single commit. This can help keep the history clean and easy to read.

Before you merge branches, you must ensure they are up-to-date. First, you should fetch the latest changes from the remote repository. This updates your local copy with changes made by others. After fetching, you can pull changes from the remote repository. This keeps your local branch synchronized.

Understanding branch structure is essential when preparing for a merge. You must identify the base branch, which is the branch you want to merge into. It is often the main or master branch. Once you identify the base branch, you can select the feature branch that contains your new changes.

When it is time to merge, you will use specific Git commands. The basic merge command is simple and allows Git to combine the branches. You can also use options with the command to specify how the merge should occur. After entering the command, you will execute the merge process.

However, you might face merge conflicts during the process. These conflicts happen when changes in the branches overlap. To resolve them, you will need to review the conflicting files. Then, you can choose which changes to keep. After solving the conflicts, you can complete the merge and continue your project.

Identifying Merge Conflicts Is Key

When you merge branches in Git, you may see signs of conflicts. One common sign is when Git gives you error messages. These messages usually indicate which files have issues. You may also notice your code does not work as expected after a merge. Tools help find these conflicts too. You can use `git status` to see which files are in conflict. Visual tools like GitKraken or SourceTree are helpful for this as well.

Resolving Conflicts Takes Patience

Once you find conflicts, you need to resolve them. You can do this manually. Open the conflicting files and look for conflict markers. They look like `<<<<<<<`, `=======`, and `>>>>>>>`. You carefully decide which code to keep. It may help to talk to your teammates about their changes too. If manual resolution is hard, you can use merge tools like Kdiff3 or Meld. These tools show differences side by side, making it easier to choose.

Completing the Merge Is Important

After resolving the conflicts, it is time to finish the merge process. First, you need to stage the changes. Use `git add ` for each file you changed. This tells Git you are ready for the next step. Then, you must commit the merge. Use `git commit` to save the changes in your history. Be sure to write a clear commit message that explains what you did. This step is crucial because it helps everyone understand the changes.

Best Practices Keep You on Track

Regularly merging branches helps avoid large conflicts later. Try to merge your changes into the main branch often. This practice keeps your project organized. It is also wise to keep branches small and focused. Smaller branches are easier to manage and review. Use descriptive commit messages. Good messages provide context and make it easier for others to follow your work. Emphasizing clear communication in team projects leads to better collaboration and successful outcomes. Understanding and mastering these merge strategies strengthens your teamwork in Git.

Git merge is a key part of working with version control. Understanding it helps you to keep your project organized. Git merge allows you to combine changes from different branches. This process makes teamwork easier. When one person works on a feature and another on a bug fix, merging brings both sets of work together.

There are several types of merges in Git. You can do a fast-forward merge. This happens when there are no changes on the main branch. Git simply moves the main branch forward. A three-way merge occurs when there are changes on both branches. Git uses the last common commit to join them. A squash merge combines all changes into one commit. This keeps your history clean.

Preparation is important before merging. First, make sure your branches are up-to-date. You fetch the latest changes first. This helps sync your local files with the remote files. Then, you can pull in those changes. After this, you will identify the base branch. This is the branch you will merge into.

Next, you select the feature branch that has your changes. When you are ready, you type the merge command into Git. It is a simple command once you know it. You may also use options for more control. After you execute the command, you begin the merging process.

Sometimes, merge conflicts will happen. These occur when two branches try to make changes to the same line of code. To solve conflicts, you must look at the files. Review what both branches want to change. Then, decide which changes to keep. Once you solve the conflicts, you are ready to complete the merge.

Mastering Git merge is very essential. It helps you work better with your team. With good merging, you save time and effort. You avoid many problems that arise in collaboration. Take time to learn and practice merging for successful development projects. Another Post Explains git merge and branching very beautifully here is the link

[cold--carnage]

I want my art to make it to top post status on my page but they never get enough notes :/

[stellerssong]

agent kiran estevez astral dive suit. post tweet

[syekick-powers]

man you know i understand why some people are pushing really hard for the idea of mental illness/disorders being as a result of stress in capitalism. i understand that a lot of depression anxiety etc is often triggered by shit ass conditions that exacerbate misery. but i really don't think we should swing all the way in the other direction of "all mental disorders are due to stress and if capitalism didnt exist depression/anxiety/etc would simply Go Away Magically" like. homie. sister. gurl. bruh. i am bipolar. i will basically always be bipolar. i will need to be medicated for my bipolar for the rest of my life because my brain swings back and forth between manic and depressed for lengths of months on end. even when i am very heavily medicated and in a relatively stress-free environment i can still tell that my brain is going back and forth between depressive/manic episodes basically constantly because certain symptoms still display even with the amount of mood stabilizers i'm taking. even if capitalism vanished tomorrow and all world governments were replaced with socialist systems and climate change was suddenly reversed and everyone on the planet lived in harmony, i would still fucking be bipolar and still have manic and depressive episodes. mental illness will never be defined by a one-size-fits-all definition. some people's mental issues are caused by stress. some people's mental issues are exacerbated to unhealthy levels by stress. some people's mental issues will continue to exist regardless of their stress level. all these things can be true at once.

[unixbhaskar]

A glance 👀

[kirantech]

AEM Component and Template Auditor

The "Component and Template Auditor" allows you to analyze your project, identifying components and templates with zero references. This knowledge empowers you to make informed decisions regarding whether to keep or remove them.

Problem Statement: How can we effectively assess whether the components and templates within our project structure are actively used on web pages? This knowledge is crucial for making informed decisions regarding component and template maintenance. Introduction: When organizations undertake AEM upgrades or migrations, they often introduce new components and templates following revised project…

[apaintingfortheartist]

https://codesnippetsandtutorials.com/2023/09/02/a-collection-of-git-software-libraries-plugins-and-tools-for-very-large-repositories-and-large-file-hosting-in-git/

[frog707]

GitKraken 9.7.1

I just now disabled the experimental "Use Git Executable" feature in my GitKraken 9.7.1 client because it interfered with my ability to push changes to GitHub. I've reported the issue to gitkraken.com, but I doubt I'm the only one experiencing this...

[fpacini]

A few days ago I discovered GitKraken. A Git client with a GUI and CLI, and some usefull integrations with tools like GitHub and GitLab issues, Jira, Azure DevOps, Trello. Other features that I find interesting include Workspaces that can be used to group repositories and multiple account profiles.

I've been testing it and so far the GUI seems nice and easy to use. The CLI helps with simple autocomplete.

I've found some problems on my KDE Linux that I have yet to resolve. I've not been able yet to configure the external terminal and external editor. Maybe it depends on the flatpak installation.

There is also a quick tutorial showing all the features.

The free version is limited to public cloud-hosted repos, but the Pro version at € 4,95 per user/month seems worth the expense.

[codingquill]

Essentials You Need to Become a Web Developer

HTML, CSS, and JavaScript Mastery

Text Editor/Integrated Development Environment (IDE): Popular choices include Visual Studio Code, Sublime Text.

Version Control/Git: Platforms like GitHub, GitLab, and Bitbucket allow you to track changes, collaborate with others, and contribute to open-source projects.

Responsive Web Design Skills: Learn CSS frameworks like Bootstrap or Flexbox and master media queries

Understanding of Web Browsers: Familiarize yourself with browser developer tools for debugging and testing your code.

Front-End Frameworks: for example : React, Angular, or Vue.js are powerful tools for building dynamic and interactive web applications.

Back-End Development Skills: Understanding server-side programming languages (e.g., Node.js, Python, Ruby , php) and databases (e.g., MySQL, MongoDB)

Web Hosting and Deployment Knowledge: Platforms like Heroku, Vercel , Netlify, or AWS can help simplify this process.

Basic DevOps and CI/CD Understanding

Soft Skills and Problem-Solving: Effective communication, teamwork, and problem-solving skills

Confidence in Yourself: Confidence is a powerful asset. Believe in your abilities, and don't be afraid to take on challenging projects. The more you trust yourself, the more you'll be able to tackle complex coding tasks and overcome obstacles with determination.

[hidden-for-reg]

July 1: astrology | @jegulus-microfic | word count: 880

*surgeon x patient au*

previous part, part one

As soon as James had left, Regulus had wanted him there again, but he was sure James had tons of real work to do. In all fairness though, Regulus did need to talk to James about his surgery. Regulus had decided by now that he did want the surgery, and not just as an excuse to spend more time around James. Frankly, his knee was constantly in a low, throbbing pain even though Dorcas had given him some painkillers. It had been getting annoying. Plus, Regulus figured it couldn't hurt anyway since his brother was a doctor and therefore, Regulus had good medical insurance, so money wouldn't be an issue here.

Regulus' train of thought was interrupted by Dorcas coming into his room with a light knock. "Hey, babes," she cooed, plopping herself down next to Regulus on his bed, "I've got today's astrology horoscope, thought I might share." He scooted over to make more room for her and she curled into his side, taking out a magazine. 

Dorcas flipped it open and began rambling to Regulus about all the ways she was supposedly going to be lucky that day, according to her star sign.  Then, she opened the magazine to a new page and started telling Regulus about the ways he'd be lucky that day. 

"Wait, but how'd you know my birthday?" He asked her, interrupting her warnings to him about things he was supposed to avoid that day.

Dorcas laughed. "I may or may not have looked at your chart," she remarked with a smirk.

"Well, I sure hope you looked at my chart, you're the nurse on my case," Regulus retorted with a chuckle. 

"Oh, and Regulus, look," Dorcas added, tapping her finger on the page, "it says here that you'll be lucky in love, today." She smirked at him again. "Or, perhaps, have you already gotten lucky in love today?"

"Dorcas, I've not even known you for a day," he snorted.

"Hardly means I can't be interested in what you've got going on with one of the hottest guys in the hospital." 

"I thought you said you liked girls though?"

"My love, some things are just universally agreed upon, and James Potter is one of those."

Regulus couldn't argue with that so, he remained mostly silent and gave her a vague mumble to show he agreed. 

"So? Tell me what happened after I left!" Dorcas demanded, punching him playfully in the arm.

"Well, he came in, saying all this BS that he needed to check my heart beat," Regulus started, "then, he took out his little heart-listening-tool thing and stood a million times closer than normal. But, like, no complaints from me. Then, he was all like 'good news is you're fine, bad news is I can't snog you'. By that point he was less than an inch away, but then the git had the gall to just cut it quits there and leave. So, that's what he did!" Regulus finished his story with an exasperated flourish of his hands, dropping them in his lap after. 

Dorcas opened her mouth, clearly about to ramble again, when Regulus' phone began vibrating from where it sat on the bedside table. He picked it up, groaned inwardly when he saw the name on the screen, and answered. 

"Barty, mate, what is it?"

"What, I'm not allowed to check in on my best friend while he's in the hospital? When Evan had to go to the hospital for his broken ankle, I called him every couple hours. And he never complained, not once!"

"Barty, Evan's your boyfriend, of course he didn't complain!"

"Just because we're not lovers anymore doesn't mean you have to stop showing me the LOVE, Reg. Where's all that LOVE you showed me when we were together? The love we had when we were still f-"

"Barty."

"Right, right. Anyways- Evan, me, and Pandora are thinking of coming round the hospital to be with you before and after the big surgery." 

Regulus rolled his eyes.

"Well, if Evan and Panda don't decide to show up, I know I'M coming, because I'M an amazing best friend. Well, apparently not, according to the lack of love you're showing currently."

Regulus rolled his eyes again.

"HEY. I can feel you rolling your eyes. Because only a best friend would be able to tell and I just so happen to be-"

"Okay, yes, Barty, I love you, the love is here, this is me showing you the love," Regulus stated flatly. "Is that all? I was a bit in the middle of something."

"Oh, in the middle of something? Who have you charmed into thinking you're normal again? They better not be trying for the best friend slot, Reg. I don't know if I've made it clear, mate, but as your best friend, I kind of care about you and wouldn't like to see some other idiot kick you around. Call me a crazy, possessive ex, but hey, that's exactly what-"

"Barty, mate, love and care aside, please shut up."

"Alright, alright, I get it. I'll leave. I can take a hint. I can tell when someone doesn't love me anymore-"

Regulus hung up on Barty and sighed, putting his phone back on the bedside table. "Sorry, Dorcas," he mumbled. 

Next part

[amuseoffyre]

Hypothesis: Ed actually already knows how to fix and clean stuff around a house (not just a ship), because he used to do that as a child (to save his mum the trouble - if anyone laughed, he could make the excuse that he was saving her time and energy that she could use for doing *paid* housework for posh gits). He might also have learned to cook on a budget from her, but maybe that's speculating too far...

I wouldn't be surprised by that tbh. In poor households, kids were expected to take up labour as soon as they were big enough to hold tool. Whether in the house or being sent out to work, there's plenty of historical aspects that would support Ed being pulled into domestic tasks early on.

That said, Ed and domesticity have a... complicated relationship. Our man desperately wants to be married and in a safe and loving relationship, but his template for what a happy/safe relationship is skewed at best.

I know I've mentioned this before, but it has me in a chokehold: Ed definitely self-soothes using simple domestic tasks in times when he's in situations where his whole world has just turned on a dime, usually as a mechanism to say "look everything's fine. We're all good".

When he's surrendered his identity, his beard has been shaved off, and he's now pretty much a slave to the empire for the next ten years, he's sitting folding laundry. Because it's fine. This is all fine. I'm fine. You're fine. We're fine.

When he's been abandoned by Stede and vaguely shared about it with the crew and decided to turn them on a new path towards a talent show, he goes back to his cabin and starts cleaning. Because it's fine. This is all fine. I'm fine. You're fine. We're fine. WE ARE ALL FINE SHUSH DON'T LOOK TO CLOSE OR SAY ANYTHING.

And, of course, most significantly, when he's shot Izzy and had his breakdown on the front of the ship, but the next morning, he's cleaned all of the cabin and scrubbed it down and freshened himself up. BECAUSE. IT'S. FINE. THIS IS ALL FINE. I'M FINE. YOU'RE FINE. WE'RE FINE.

We are definitely not going to push someone to kill us. We are definitely not going to drive the ship into a storm because no one is taking the fucking hint to do the big job for us.

WE. ARE. FINE.

Even within the context of his own subconscious in the gravy basket there are layers and layers of him folded in there: the most hated parts of himself manifested in the shape of Hornigold but Hornigold is doing all the domestic tasks.

We see him making soup and trying to feed Ed as a parent would try and feed a stubborn child, foraging for ingredients for boil-up and weaving sandals. Also worth mentioning the stuff Hornigold has around him are all Maori elements - the type of woven sandals, the ingredients for the food, the basket. The two parts of Ed's traumatic history incarnate - one of his white abusive father figures carrying out the domestic routines of his Maori mother.

Because it's fine there too. Totally fine. Not at all avoiding anything. STOP LOOKING. NOTHING TO SEE.

And later, much later, he decides to become a fisherman and take on the domestic chores of sorting out the meals for his employer, because... well, you know the drill. He's fine. He's totally fine. He's not at all stuck in a repeating cycle of taking refuge in domesticity and pretending everything is totally fine and normal and not at all anything to do with the memory of the domestic situation in his childhood growling down his neck.

[metamatar]

What are the correct reasons to hate ao3 I'm curious

volunteer only model that results in an org run by rich / middle class people with a lot of time, extremely cliquish organisational structure that is very resistant to outsider critique (mostly about racism), lack of good tools to prevent harassment. tag wrangling is also nightmarishly designed and held up by hundreds of labor hours. how is the site still in beta. i say hate but ofc i think fan culture has benefited immensely because of ao3 – im grateful for it like im grateful for the existence of git. idk if people understand that its dominance in modern fan culture comes precisely from its commitment to not doing any censorship and not being a social media site.

[jj-5656]

Sneaking Suspicions With; Tangerine (Bullet Train)

A/n: Are we proud? Two uploads in two days. This is how I procrastinate doing any homework. Could not get this idea out of my head so here we are. This is my first for Tangerine, but I just recently rewatched Bullet Train and couldn’t resist. Had to add Lemon too because it’s simply not complete without him. Also, the bit about Thomas is all true, I was obsessed with that show when I was young. Enjoy!

Summary: The one where your boyfriend attempts to build a kitchen table, and nearly slaughters your neighbor...

T/W: A LOT of cursing, some suggestive humor, mentions of violence...duh

“Bloody fuckin’ hell.” You wince as tools clatter in the kitchen. Discarding your current task of rummaging through boxes with Tangerine’s scribbled writing marked ‘bathroom’.

You’ve finally moved in to the new place after months of preparation. Having been together for 8 months, it was about time you moved in together. Tan practically lived at your old place anyway, though taking this step was intimidating for both of you. His brother had egged you on for months, desperately wanting their shared apartment as his own.

Hence why Tangerine is sat on the floor, muttering curses as he attempts to assemble your dining table.

“Tan, why won’t you let me help you?”

“I told you, I’ve got it, love. Fucking bastards,” his shoulders tense with anger as he speaks. “Can’t even make a buildable fuckin’ table. I’ll show them ‘quick and easy’ right up their fuckin’-”

“Did you even look at the directions, baby?” He furrows his brows, turning to you like you’ve grown another head. 

“Directions are for morons.” 

“Or for people with zero table assembling experience.” You mutter, fighting a grin under his tense stare. He wipes a bead of sweat from his brow, only sporting a wife pleaser and trousers in the summer heat. You internally cringe at the reminder your stubborn boyfriend intends to install the air conditioner on his own as well.

“Maybe we could ask Brian across the hall, he said he does construction for his dad part time.”

“You chopping it up with that lad already? Right git, he is.”

“He’s nice, Tan.”

“He’s a flirt, and a shit one at that.” It forces a laugh from you, Tangerine frustrated that the sound still manages to ease the tension from his muscles. 

“I’ll ring Lemon, then.” 

“I swear to Christ, if you call my muppet of a brother-” 

And that’s how Lemon ends up knocking at your door, takeout in hand and a bright smile on his face at the sight of you. 

“Hello, lovely. Call for reinforcements already?” 

There’s a distant “fuck off” from the kitchen, but you nod nonetheless, thanking him for the food and much needed company. Lemon’s rooted for your relationship even before his brother. Insisting he get your number that fateful night in that shitty club all those months ago. 

***************

You’d been sharing drinks with a group of friends when a man bumped into you, nearly knocking you over with the size of him. He’d caught you by the shoulders before you could fall, sending the drunken, clumsy patron an icy glare before surveying you for any injury. He’d clasped both his hands around one of yours, profusely muttering overly-posh, accented apologies. You were ready to cuss out whoever had been so careless before you laid eyes on him, overwhelmed with the British charm and piercing eyes. 

“Can I buy you and your friends a drink? I’ll be out of your hair after, promise.” His sincerity makes you want to request he sticks around the rest of the evening, though you shake your head. Polite commonalities ingrained in your nature. 

“Not necessary, I appreciate it.” You assure with a kind smile, ignoring your friends gawking at the pin-stripe clad gentleman. He nods, not wanting to make you any more uncomfortable as he gives your elbow a gentle squeeze in one last apology. Heading back the way he came, sitting beside another well-dressed man at the bar. What looks like a round of chastising from the raven-haired man, and the handsome stranger is waving him off, glancing over at you and taking a generous sip of his drink. 

“You did not seriously just turn Poseiden-incarnate down.” Your girlfriend finally manages to close her slacked jaw, frustrated with your shyness. 

“He was just being polite, Brooke. I didn’t want to have him buy for the whole table in obliga-” A waitress approaches before you can finish, smiling brightly at the lot of you as she sets down a round of espresso martinis. 

“The gentlemen across the bar insisted. On him, of course.” The older woman shoots you a wink, a chorus of cheers from your friends in salute to the man across the way. He sends a kind smile, tilting his own glass and looking like he hates the sudden attention. He meets your eyes for only a moment, starting up conversation with the man beside him in a silent obedience to his promise of leaving you be. 

It’s hours before you see him again, headed outside for some fresh air after spending too much time on the dance floor. You’re sober enough to hold your own, comforted in the array of bouncers nearby if needed. You’re sat on a bench just in front of the club, craving some relief from your heels. There’s a flick of a lighter beside you, a curse when it doesn’t ignite any flame. You’re searching through your clutch instantly, offering up your own light without a second thought. 

“Didn’t take you for a smoker.” You perk at the accent, trailing the extended arm to meet the man’s gaze for the third time that evening. 

“Don’t. Not cigarettes, anyway.” He smiles through the now ignited stick, quirking his head in quiet contemplation. His eyes study you, and surprisingly, it’s almost endearing. There’s no suggestive indications to his observations, like most men you’d encounter. It’s contemplative, as if he’s trying to figure out. 

“You always stare at strangers?” Your wit pleasantly surprises him, and his grin grows despite himself. 

“Apologies, love. Just taking it all in. Mind if I sit?” You nod, thanking the cold for the constant flush of your cheeks that’ll hopefully conceal the blood that rushes to them at his words. “Never got your name.” 

“Y/n, nice to meet you.” You take his extended hand for a shake, wincing at the formality of your words. 

“Tangerine, pleasure’s all mine.” He awaits the usual ‘like the fruit’ with sudden irritation, but it never comes, so he relaxes.

“That a nickname?”

“Of sorts.” You don’t pry, not interested in scaring him off just yet. If he wanted to tell, you, he would. In his mind, Tangerine thanks you profusely. Pleased to have met someone uninterested in forcing information out of him. 

“Whose your friend?” You mean the other good-looking guy beside him the entire night, who must still be inside. 

“Brother,” he corrects, not unkind. “Hoping he won’t be trollied on the way home.” Your eyes narrow, unaccustomed to the slang. Tangerine exhales a stream of smoke away from you, wetting his lips with a twinge of amusement. 

“Drunk, love. Or wasted, as you’d put it.” A laugh escapes you, thoroughly entertained with his dramatic mock of an American accent. 

“That is not how we sound.” You nudge his shoulder with your own, defensive and patriotic for likely the first time in your life. “You guys are still salty we won.” He bellows a laugh this time, and the warm sound erupts butterflies in the stomach. 

“Blokes chucked boxes of tea in the ocean in retaliation. The fuck kind of war crime is that?” 

“One that proper fucked your economy.” You attempt your own dramatic accent, curious as to why he tries so hard to fight smiling. You assume he’s usually much more stoic without the aid of alcohol and new company. 

“Bloody hell, that was awful.” He teases with no real ill-will, stubbing out his cigarette when his brother stumbles out of the building. You hear him mutter something about ‘shit timing’ as the taller man approaches, kind smile adorning his handsome features. 

“You’ve found your Edwards!” He clasps his hands together, absolutely delighted before he sits himself in between the two of you. Tangerine looks absolutely pissed, astonished when you beam brightly at his intoxicated brother. 

“Edwards?” You question despite Tangerine’s shaking head of warning. 

“Edwards.” He assures, adjusting his suit jacket as he gets comfortable. “Wise, kind...We’ve only just met, I know. But, you see, I’m great at reading people.” 

“Christ, here we fucking go again.”

“Everything I learned about people, I learned from Thomas the-” 

“Tank engine!” You finish for him, the pair shocked at your enthusiasm. “That was my favorite show when I was little!”

“You don’t say?” The man beams, looking over at his brother with an undoubted stamp of approval. 

“Swear it. Had the stuffy for years, an entire train table set too.”

“The one with the wooden tracks you could build yourself?” 

“And the magnetic crane to lift up the figurines!” The two of you are absolutely enamored, enthralled in the conversation whilst Tangerine broods opposite you. Making a mental note to shoot his beloved brother in the foot the second he gets him alone. 

“Bloody hell, I loved that set. What a coincidence!” He turns to his brother, shaking with anger. 

“Fuckin’ unbelievable.” Is all he manages, messing with the rings on his fingers to calm himself from the outright cockblock. Fuckin’ muppet. 

“Names’ Lemon. Pleasure to meet you doll, truly. A real Edward, you are.” 

“You really think so?” The alcohol ends any fight to conceal your pleased expression, glancing over at Tangerine who forces a smile at your grant of attention. 

“Know so. Brother over here’s a Gordon, don’t you think?”

“I could see that.” This time you’re the one to study said man, lip quirking when he shifts under your gaze. 

“Alright, we should get you home.” Tan rises with a roll of his shoulders, ready to head back with his head hanging low in a failed feat. Lemon frowns, pushing away the strong arm that’s pulling at him so he can dig through the inner pocket of his expensive jacket. Pulling out a folded and well-worn sheet of paper. 

“Here comes the fucking sticker book. Of course.” 

“You know I bring it everywhere. Here, love.” Lemon peels the Edward sticker from the sheet. Sticking it onto your finger with a soft ‘boop’. You gasp, delighted. 

“The lady’s real chuffed, Lemon. Let her get back to her friends for Christ’s sake.” He pulls the man to a standing position, waving down an approaching taxi with an ear-piercing whistle. “You got a friend getting you home safe, sweetheart?” You nod, pressing the new sticker to the back of your phone and pressing your case back on it. Aiming to keep it safe indefinitely. Tan suppresses a smile, finding it absolutely adorable. He buttons his jacket, straightening in self-discipline to push away the love-sick thoughts. 

“Have a good night, you two. It was nice meeting you.” There’s a hint of sadness in your tone, the farewell and the unlikeliness of running into them again tugging at your heart strings. Weird, considering you just met the two men and you already want to get to know them more. Especially the handsome fuck with the unrelenting charm. 

“Like-wise, love.” Tangerine ushers his brother into the backseat of the car, muttering something to the driver before turning on his heel to face you again. Brows taught in consideration. He battles with himself, weighing if he’s selfish enough to try and get to know someone as seemingly kind-hearted as you. You’d deserve better. He surveys you a final time, every nerve-ending in his body begging for more. You’re about to head back inside when he clears his throat, grabbing your attention.

“Any chance you’d be willing to give me your number, sweetheart? Just to make sure you get home safe?” He prays it doesn’t sound too hopeful, as desperate as he is for you to comply. You cock your head incredulously, and he swears his heart skips a beat. 

“Just to make sure I get home?”  

“And maybe to ask you to dinner. Or, you say no and I fuck off.” You chew on the inside of your cheek to suppress the excited grin. Hoping you appear nonchalant despite yourself. Taking a few steps forward, you extend your hand. Brows raising in expectation as he stares at you. He snaps out of it, digging into his pocket with a muttered ‘oh, right.’ 

“All right mate! Thought you’d never get the balls to ask her. Been going on and on about her since you nearly tackled ‘er”

“Fuck off, Lemon.” Tan seethes, eyes averting to you when you giggle through your rushed typing into his phone. “He’s drunk, pay no mind.” 

“Trollied, right?” There’s teasing heavy on your tongue, and it takes everything in him not to pull you in for a kiss right there. On the curb of some mangy club whilst the impatient driver honks in warning. 

“Right. Goodnight, love. Careful getting home, yeah?” You nod, mindlessly standing up on your tip-toes to press a kiss to his cheek. 

“Night.” 

And with that, you’re headed back inside. Feeling his eyes on you the entire time. Only looking back when the door closes behind you. Ensuring he can’t see you spying. He has his head down, biting a smirk from his lips before gaining composure, tossing himself into the cab beside his brother. 

***********

“You’re not needed, I have this handled.” 

“You don’t actually. I’ve seen corpses more capable of brain activity than this, mate.” 

“Piss off.” 

“I would, but I like your girlfriend more than you, and therefore don’t want to leave her with this,” he motions to the mess of tools and table parts, “all alone.” 

The two of you sit opposite him, Lemon unfolds the discarded instruction sheet with a deep sigh. 

“You’ve got the wrong bolt on that one.”

“No I don’t.” 

“You do, mate. Considering I’m the one with the fucking instructions.” 

“See, if I was a fuckin’ mug like you, I’d need the directions. But I’m not, so I don’t.” 

“Well, you must be. Considering that’s the wrong fucking bolt.” 

You rub your temples, fighting an oncoming migraine. Taking the drill from the floor and setting it counter-clockwise to remove the damned bolt. Tan takes it from you, setting his hand on your stomach to push your criss-crossed form backward. 

“Hey!”

“What did I say? I didn’t want you doing this, Dove. You’ve just gotten those nails done. I-” He stops himself, taking a breath. “We got this covered.” 

“This seems patronizing and sexist.” 

“Quite the opposite. I respect you so much I’d rather not have you sit on the floor and do this.” 

You huff, arms crossed as you glare at him. Too worn out to argue, and figuring there’s an array of boxes to be unpacked, you scramble to your feet. 

“Fuck you.” 

“Maybe later, love. I’m quite busy at the moment.” The cheeky response gets a laugh out of even Lemon, who straightens as soon as your heated gaze snaps to him. You flip them both off, no real anger to it as you head back toward the bathroom. 

**********

Another couple hours pass and you’ve finished both bathrooms and are working on the master bedroom. Airpods in to block out the onslaught of arguments. You hum to your music, unaware of the eyes on you.

Tangerine leans against the doorway, finding comfort in watching you in your shared home. It’s weird, new, to share just about everything now. Scary, no doubt. Tan had walls around him so high it took months for you to even shake them. But you’ve done it, somehow. A little minx, he regards you, because you’ve managed to get through to him sometimes without him even realizing. He’s eternally grateful whatever scraps of good karma he had left accumulated to bring you into his life. Terrified it might one day be ripped away. Every time the thought passes his mind, his throat tightens, and he gets the overwhelming urge to hold you and never let go. 

Your startled gasp snaps him out of it, a hand clasping over your heart in shock. “Christ, Tan. Give a girl a warning.” 

“Sorry, sweetheart.” He swallows, a beat before continuing. “I love you.” Your eyes narrow at his sweet tone, trying to uncover the mischief in his sultry voice. 

“What’d you do?”

“Nothing, honest. I can’t say I love you?” 

“You can.” You turn your head from him, suppressing a smirk as you busy yourself with folding clothes. “Just...Not in the hall, okay?” 

“What? Why?”

“It’s just,” you’re holding in a laugh now, a death wish for sure. “I don’t want Brian to hear, that’s all.” He crosses his arms, hiding his clenching fists at your teasing. 

“You think that’s funny? Taking the piss like that?”  You muffle a laugh with your sleeve, morphing it into a cough. “Tread lightly, my love.” 

“You know, I bet Brian builds loads of tables. Must be real fast at it, considering he works in construction and all. Lot’s of strong men in that field of work.”

“Y/n.” Your name is rare on his lips, singed with irritation. You’re clearly well-past having him worked up, You press on, keen on getting him back for his suggestive comment from before. 

“I always wanted to get to know a blue-collar type. So hardworking, great with their hands-” You’re in the air and flopped onto the mattress yet to have a bed frame before you can even process it. He cages you in, an arm on either side of your head to support himself as his eyes bore daggers into yours. Curls unruly and dampened with sweat. 

“Stop it. Or beloved Brian’s in a body bag by tomorrow morning, yeah?” You know he’s not entirely serious, but also entirely capable, so you nod. You press your lips together, thoroughly amused. He takes your jaw in his hand and uses his thumb to pull your lips free. Tugging you into a kiss, he’s only satisfied when you gasp after your bottom lip is bit. Not too hard, he’d never hurt you, but it’s enough warning to shut you up. He gets up, hands on his hips and breathing heavy as he watches you get to your feet. Wordlessly, he sweeps a leg under yours, chuckling when you’re collapsing back into the mattress with an umph. 

“You really are a fucking Gordon, you know that?” There’s no time to scramble away from his lunging form as he tugs you by the ankle toward him. One hand grabbing your arm and the other on your leg as he hoists you over his shoulder, cheekily reminding you of the power imbalance as he carries your squirming form down the corridor and into the kitchen. Where Lemon lays sprawled out on the now standing table. The air conditioner hums across the room, and the faux argument is ripped from your mind as you survey the accomplished tasks. 

“Nothing a little teamwork and drive can’t do,” Lemon boasts. “You know where I learned that, Tangerine?”

“If you mention the fucking trains, It’ll be the last thing you fuckin’ do.”

*************

“Tan, could you pass the lo mein?” Your boyfriend chews thoughtfully, considering it for a moment before extending it to you. Your eyes narrow when he pulls away as soon as you reach. 

“Maybe you should ask Brian.” 

“My god, we’re still on this?” 

“Should have known better than to tease him with another man, love. Gordons are prone to jealousy.”

“Fuckin’ pipe it, Lems.”

“It was a joke, baby. Are you gonna hold this over my head forever?” You find it endearing, hard to believe Tangerine could think there’s even a hint of honesty to your teasing. 

“Until I’m sure you’re proper guilty, yeah.” There’s a hint of play in his tone, and you know he only wants to hear you repeat your devotion. 

“Tan, love, baby, sweetheart, love of my life, will you please pass the lo mein to your dutifully devoted girlfriend?”

“Sure thing, love. Could have just said so.” The playful banter is stuttered to a halt when Tan sets the box beside you, the legs of the newly built table creaking as they give out. With their instinctive reflexes, Lemon and Tangerine keep the entire thing from collapsing. You’re slack-jawed, in utter shock at the absurdity and slight victory of being right, as god damn usual. 

“Dove,” your boyfriend’s voice strains under the exertion, meeting your eyes “be a doll and take everything off here?” You’re up in an instant, quickly snatching the array of food and plates off the surface. Lemon begins to laugh despite himself, and Tangerine seethes with frustration. 

“Maybe we should-”

“Don’t. Don’t even think about saying that fuckin’ muppets name.” Tan stares daggers into his brothers eyes, paying no mind to your stifled giggles. When they finally set the table on the ground, you approach him. Tugging at his arms so you can wrap yours around his waist. You press your chin into his chest, running a hand through his unruly curls. 

“Baby.” You’re soft, tone so sweet and eyes big and pleading. 

“Lose the puppy eyes, doll. It’s a no.” 

“I personally would like to finish dinner not on the floor. But that’s just me.” Lemon purses his lips, brows raised expectantly at his brother.

Tan releases a deep, shaky sigh, dark gaze softening when he meets yours. He tries to tug his head away when your hands hold it, but you’re insistent, making him face you again. 

“I’m all yours, alright? I promise.” You kiss both his cheeks and then his neck, some tension leaving him. He tilts his head in faux irritation when you stick out your pinky to him, grinning when he finally gives in and wraps his much bigger one around yours. 

**********

“It’s already so nicely decorated in here.” Brian surveys the room with a polite smile, turning to you. “All this is your eye, y/n?” You straighten, hoping the man won’t notice your boyfriend’s homicidal stare. 

“Tan has more taste, admittedly.” You’re not just trying to take the attention off you, it’s the truth. 

“Well that should be obvious, he got you.” Lemon coughs, setting a hand on his brother’s shoulder with tight, grounding grip. The slightly shorter man boils beside him, eyes boring into yours in an enraged ‘I told you so’. 

Your neighbor places his work bag on the floor, cringing at the sight of the flattened table. He approaches the brothers, clueless, patting their arms with sympathy. 

“Should have gotten me earlier, guys. You know you can call me over any time for some help. Handiwork isn’t for everyone, some things are just left for the professionals. 

“No kidding.” Tan mutters, letting Lemon pry his fingers from the biggest kitchen knife you own when the man’s back is turned to them. 

“We’ll have to grab brunch sometime, y/n.” He’s blissfully unaware as he talks between rounds of the drill. Unscrewing mistakes and penciling out where they should actually go. “I’ll fill you in on the rest of the neighbors. Some of the ones to avoid and all.” Lemon’s practically wrapped around his brother, praying to a god he doesn’t believe that the clueless fuck will shut up. You cross the room while he drills away, placing your hands on Tan’s chest and pressing into him. He can’t even see you, can’t even feel you as his blood burns his own skin. Considering the fasted method of kill and cleanup over and over again in a final stitch to calm himself. 

“You’ll have meet Cody first, of course. I’ve already told him there’s finally another young couple in the building. Thank god.” 

“S-Sorry, mate?” Lemon loosens his grip in realization, fighting a bellowing laugh. 

“My bad, I tend to drill when I’m talking. Cody gets on me for that, too, This is what I mean, sweetheart. We need to escape the doting boyfriends for a little. Enough to drive anyone nuts.” He shoots you another smile, pleased to see you nodding profusely. 

“Absolutely.” You turn to Tan, whose brows are taught in utter confusion. “They can be a real pain sometimes.”

“But, alas.” The drill whirs, he stops talking for a beat and then releases the trigger to finish. “We love them.”

“To bits and pieces.” 

Tan collapses against the counter, right exhausted from the strain of keeping his composure. Pure relief washes over him, and you let him pull you into an embrace.

“Boys, would you mind helping me turn this right side up? i think I’m all finished here.” They comply, Tan reluctantly pulling away and kissing your temple in silent apology. Together, they set it upright and each give it a good shake to ensure it’s stability. 

“Thanks, mate. I owe you.” Your boyfriend gives the now beloved neighbor a firm shake, a hint of guilt in his eyes. 

“British and handsome, you two are truly a killer pair.” Brian gathers his things and checks a notification ding on his phone. Sighing fondly. “Speak of the devil.” He waves his phone to you with a lighthearted roll of his eyes. “See you all soon.” Giving you a quick hug, he exits as soon as he came.

“Most definitely not a diesel, that bloke.” 

[gender-trash]

IT WORKEDDDDDD I MOUNTED MY STUPID-ASS ENCRYPTED DISK :)

the problem is of course, as always, that i have no idea what i'm doing but after some blundering around i managed to get the thing both decrypted AND mounted, and then i chrooted into it

and all my shit is still there! especially after su'ing to my normal user account -- it looks Completely Fucking Normal, almost surreally so.

BUT. THE KICKER IS. when my laptop died i was midway through writing some fic, right? and i HADN'T SAVED THE FILE. so i pop it open in vim

vim is like "huh it looks like you've got some unsaved data! would you like to restore it?" I SURE WOULD!!! THANK YOU!!!

(the other kicker is that i've been sort of tooling around my disorganized home folder trying to figure out what-all i should save? i committed and pushed some shit to git that hadn't been committed, copied over a bunch of random config files i didn't want to lose, my firefox tab sessions, etc, and then i'm sat there like "is that... it? is that all the important stuff?"

ten seconds later: "fuck! no it isn't! i need MY LAST THREE YEARS OF TAX RETURNS")