#git merge

[tropiyas]

working devops and being responsible for code management across a large project will have you feel like some kind of administrator of time travel and you can see people fucking up the entire timeline every few weeks because they are all unaware of what the other idiots are doing

[snarp]

I'm allowed to cause terrible problems

[wuggen]

I have no fucking idea how we managed to accumulate this much technical debt this fucking fast

[compsci-haikus]

Merge commit failed. Could've been avoided but I am bad at git.

please let me merge please please please please please please please please please please please please please please

[intelliatech]

Top 10 ChatGPT Prompts For Software Developers

ChatGPT can do a lot more than just code creation and this blog post is going to be all about that. We have curated a list of ChatGPT prompts that will help software developers with their everyday tasks. ChatGPT can respond to questions and can compose codes making it a very helpful tool for software engineers.

While this AI tool can help developers with the entire SDLC (Software Development Lifecycle), it is important to understand how to use the prompts effectively for different needs.

Prompt engineering gives users accurate results. Since ChatGPT accepts prompts, we receive more precise answers. But a lot depends on how these prompts are formulated. 

To Get The Best Out Of ChatGPT, Your Prompts Should Be:

Clear and well-defined. The more detailed your prompts, the better suggestions you will receive from ChatGPT.

Specify the functionality and programming language. Not specifying what you exactly need might not give you the desired results.

Phrase your prompts in a natural language, as if asking someone for help. This will make ChatGPT understand your problem better and give more relevant outputs.

Avoid unnecessary information and ambiguity. Keep it not only to the point but also inclusive of all important details.

Top ChatGPT Prompts For Software Developers

Let’s quickly have a look at some of the best ChatGPT prompts to assist you with various stages of your Software development lifecycle.

1. For Practicing SQL Commands;

2. For Becoming A Programming Language Interpreter;

3. For Creating Regular Expressions Since They Help In Managing, Locating, And Matching Text.

4. For Generating Architectural Diagrams For Your Software Requirements.

Prompt Examples: I want you to act as a Graphviz DOT generator, an expert to create meaningful diagrams. The diagram should have at least n nodes (I specify n in my input by writing [n], 10 being the default value) and to be an accurate and complex representation of the given input. Each node is indexed by a number to reduce the size of the output, should not include any styling, and with layout=neato, overlap=false, node [shape=rectangle] as parameters. The code should be valid, bugless and returned on a single line, without any explanation. Provide a clear and organized diagram, the relationships between the nodes have to make sense for an expert of that input. My first diagram is: “The water cycle [8]”.  

5. For Solving Git Problems And Getting Guidance On Overcoming Them.

Prompt Examples: “Explain how to resolve this Git merge conflict: [conflict details].” 6. For Code generation- ChatGPT can help generate a code based on descriptions given by you. It can write pieces of codes based on the requirements given in the input. Prompt Examples: -Write a program/function to {explain functionality} in {programming language} -Create a code snippet for checking if a file exists in Python. -Create a function that merges two lists into a dictionary in JavaScript.  

7. For Code Review And Debugging: ChatGPT Can Review Your Code Snippet And Also Share Bugs.

Prompt Examples: -Here’s a C# code snippet. The function is supposed to return the maximum value from the given list, but it’s not returning the expected output. Can you identify the problem? [Enter your code here] -Can you help me debug this error message from my C# program: [error message] -Help me debug this Python script that processes a list of objects and suggests possible fixes. [Enter your code here]

8. For Knowing The Coding Best Practices And Principles: It Is Very Important To Be Updated With Industry’s Best Practices In Coding. This Helps To Maintain The Codebase When The Organization Grows.

Prompt Examples: -What are some common mistakes to avoid when writing code? -What are the best practices for security testing? -Show me best practices for writing {concept or function} in {programming language}.  

9. For Code Optimization: ChatGPT Can Help Optimize The Code And Enhance Its Readability And Performance To Make It Look More Efficient.

Prompt Examples: -Optimize the following {programming language} code which {explain the functioning}: {code snippet} -Suggest improvements to optimize this C# function: [code snippet] -What are some strategies for reducing memory usage and optimizing data structures? 

10. For Creating Boilerplate Code: ChatGPT Can Help In Boilerplate Code Generation.

Prompt Examples: -Create a basic Java Spring Boot application boilerplate code. -Create a basic Python class boilerplate code

11. For Bug Fixes: Using ChatGPT Helps Fixing The Bugs Thus Saving A Large Chunk Of Time In Software Development And Also Increasing Productivity.

Prompt Examples: -How do I fix the following {programming language} code which {explain the functioning}? {code snippet} -Can you generate a bug report? -Find bugs in the following JavaScript code: (enter code)  

12. Code Refactoring- ChatGPt Can Refactor The Code And Reduce Errors To Enhance Code Efficiency, Thus Making It Easier To Modify In The Future.

Prompt Examples –What are some techniques for refactoring code to improve code reuse and promote the use of design patterns? -I have duplicate code in my project. How can I refactor it to eliminate redundancy?  

13. For Choosing Deployment Strategies- ChatGPT Can Suggest Deployment Strategies Best Suited For A Particular Project And To Ensure That It Runs Smoothly.

Prompt Examples -What are the best deployment strategies for this software project? {explain the project} -What are the best practices for version control and release management?  

14. For Creating Unit Tests- ChatGPT Can Write Test Cases For You

Prompt Examples: -How does test-driven development help improve code quality? -What are some best practices for implementing test-driven development in a project? These were some prompt examples for you that we sourced on the basis of different requirements a developer can have. So whether you have to generate a code or understand a concept, ChatGPT can really make a developer’s life by doing a lot of tasks. However, it certainly comes with its own set of challenges and cannot always be completely correct. So it is advisable to cross-check the responses. Hope this helps. Visit us- Intelliatech

[notolaf404]

[terresdebrume]

I've written a couple of scenes of Charles' having an emotional breakdown and Edwin comforting him, I felt is was time for the reverse. Set in the I'm down on my knees universe at like. Some point, IG.

Warning for mentions of racist behavior throughout and also implied ableism via the Paynes vs Edwin. Hurt comfort. Sorta.

Edwin's fists start mashing together the second his hands come off the steering wheel, which Charles knows very well is the the top one sign of a stress spiral. It's pretty much the default position for Edwin's hands whenever they go to a social thing he hasn't got the hang on yet, and the morning before all his business law exams. It feels wrong to see them like that now, sitting in front of a rustic looking restaurant where his parents are waiting for them.

"We can still leave you know," he tells Edwin. "Tell them I tested positive for COVID and you don't want to risk giving it to them or something."

Edwin doesn't quite laugh, but the corners of his mouth lift up, and the creak of his leather driving gloves subsides for a moment. He makes a face like when he's trying to figure out how to say something he's not sure how to handle. Charles, one hand on his still buckled seatbelt and the other on the door handle, waits him out. Eventually, Edwin speaks.

"I should have said earlier," he says, sounding for all the world like the words are taffy stuck in his teeth, "but my parents are sort of... Well. They have a certain idea of how the world should work and be divided—"

"Yeah, I figured," Charles says. He grins when Edwin blinks at him. "Everyone else, when we've got plans, you say shit like 'Oh, Charles is making curry tonight'—"

"I do not sound like that," Edwin protests, but Charles snorts.

"You sound exactly like that, you big toff," he says, grin widening despite himself.

Edwin rolls his eyes and calls him ridiculous, fists softening against one another. Grinning to the point his cheeks ache, Charles gives Edwin's knee a light knock with his knuckles. It makes Edwin click his tongue, but Charles doesn't lose his smile.

"My point is, with you're parents it's always like 'Charles is making dinner' and stuff. Like you're playing the pronouns game with food."

Charles suppresses a wince when. Edwin's eyes widen and his fists tighten together again, like tectonic plates gearing up for an earthquake. Of course Edwin was going to take it the wrong way. Charles should have bloody well known better.

"I'm sorry," Edwin says, I didn't mean to—"

"It's fine," Charles shrugs. "I mean they know what I look like, right?"

"Yes!" Edwin promises, hands so tight together it looks like they're going to merge. "Of course. I made sure they couldn't pretend they'd misunderstood, too, I just—"

"Then I'm fine," Charles says, making sure his smile looks easier than it feels. "I was friends with racist gits for years, I can handle your parents for an hour."

Plus, they'll be in public. What are the Paynes gonna do, try to make him join the staff? Calling him the P slur over dessert? They might think it but Charles suspects they're too interested in seeming proper to be that crassly racist where they can be heard. Probably they'll just make some noise about certain types of people and NHS fraud and jobs being stolen away from the homeless people they have no intention to help. Maybe something about Islam—there people tend to assume Charles is a Muslim a lot. He chalks it up to two birds one stone mentality, and the appeal of unlocking two rants over a single guy.

"Alright," Edwin says, looking relieved but not guilt free yet. "But if you wish to leave early, please pretend you just remembered a favour you promised Jenny, will you? I will drive us back immediately."

"Sure, I'll do that," Charles promises. He genuinely doesn't think it'll be that bad, but if he's wrong he'll be glad have the out anyway.

Reassured, Edwin takes a deep breath, and nods, and in they go. Everything is very posh in that very 'bling is for lesser people' kind of way. The menu predictably shows no prices. Edwin's parents make the usual thinly veiled remarks about Charles and Indians and brown people in general, and it's not the most comfortable but Charles could deal with it if not for the Issue.

It starts when they approach the table, Edwin's parents standing next to it with spines so straight Charles half worries he's hunched down again. Edwin places his hands in his mother's to kiss the air around each of her cheek, but then when he goes to press his fists together again, she takes his wrists and pulls his hands apart. Charles's entire back goes rigid at the sight, but he manages to push it aside and smile as he extends a hand for Mrs. Payne to shake. He said he'd do his best to make the dinner a success, and he meant it.

They sit down, Edwin and Charles on one side of the rectangular table, Edwin's parents on the other. Edwin's hands are very flat on the white tablecloth, gloves pulled away and fingers carefully aligned together. They stay there while Edwin answers increasingly invasive questions about his studies and his life, but they drift together again when the Paynes' attention turns to Charles.

"Stop that," Mr. Payne says with a stern look, cutting himself off in the middle of a sanctimonious explanation of why Charles is not being ambitious enough in life.

It's such a complete contrast to the polite, vaguely affable air he took one when speaking to Charles, and he goes back to it so quickly, Charles barely has time to react. The only thing he can think of is to press his knee against Edwin's in comfort. He should have thought of a signal for Edwin, too. Or at least asked if he wanted one.

The entree's arrival provokes some surprised praise over how their brown waiter is surprisingly well trained and articulate, and Charles takes it in stride. They're not actually saying anything to the waiter, and when they do speak he's out of earshot. He's had worse, and Edwin doesn't quite seem to be ready to throw the towel in, so he'll stick it out a bit longer. Even if Edwin's going pinker and pinker with every minute that passes.

They're about halfway through their main dishes and another rant from Mr. Payne—augmented by his wife's approving noise and not much else, Edwin having fallen silent somewhere around the time his gaspacho touched the table. Charles hates to see him like this: Edwin has always had a big personality, a larger than average presence in any room. He should be leading the conversation, or at least insisting on being heard through it, not looking down at the tablecloth with his mouth shut.

Charles is halfway through opening his mouth to pretend Jenny just texted him about plumbing issues, when Edwin's dad speaks again. He has the kind of articulation they promote on the BBC, yet Charles doesn't register any of what he says, only the fact that Edwin's fists fly together without him even noticing, and then Mr. Payne's hand darts from the other side of the table to slap Edwin's closed hands.

Now, see, the thing about Charles, is he's got excellent reflexes. Between dodging his dad's many and varied projectiles over the years, a decade of cricket, and countless hours of playing shooting games, he's pretty much primed for it. Add to that the fact that he's been getting angrier and angrier on Edwin's behalf throughout the meal, and really Charles doesn't think he can be blamed for dropping his knife, reaching out, and slapping Mr. Payne's hands.

"How dare you?" The man hisses in the deadly silence that falls over the room after the exchange.

The whole restaurant seems to hold its breath, the way Charles and mum used to do whenever dad stopped and asked 'What did you just say?'. In the corner of Charles' vision, Edwin's mouth hangs partially open in shock even as Charles hisses:

"How dare you?"

"The way I discipline my son," Mr. Payne starts, and Charles snarls.

"Your son is twenty-five," he says raising his voice on purpose. "You don't get to treat him like a bloody toddler."

"You little—" Payne senior starts, but before Edwin even has the time to react to his dangerous tone, Charles stands up with a loud scrape of his chair against the floor.

"And another thing," he says, loudly speaking over the fast purpling man in front of him, "there's nothing wrong with Edwin. That thing with the hand? You're making a mountain out of a bloody molehill! And if you didn't spend so much time worrying about it, maybe you'd realize Edwin is really bloody mint, actually, and if you can't appreciate him, then I don't see why we should bother staying here at all." Charles pushes his chair back against the table with another loud scrape, and turns to Edwin. "Come on, let's go."

Edwin's parents protest, mildly at first and then more loudly, but Charles doesn't care. He's too furious at them, at the way they filled their son with a sort of guilty shame Charles had never seen until the, at the way they somehow managed to stop him from even wanting to answer.

He waits until Edwin stands up, and then he takes hold of Edwin's wrist and drags the both of them outside. Edwin has to tug hard on his arm to remind him they used a car to come in, actually, and they can't leave it there. He sounds—well he sounds strained, is what he does. The sort of voice that means there's an emotion somewhere he's not letting out, and this time Charles knows exactly where it's going.

"I'm so sorry," he says, "I ruined dinner!"

"Oh," Charles, Edwin sighs.

His eyes are wide and wet and his grin ks kind of wobbly, but he steps up and engulfs Charles in hug anyway, hands tightly clasped around Charles waist. Charles responds in kind, putting as much love as he can into the embrace, into the pressure of his arms around Edwin.

"Thank you," Edwin mumbles against Charles' neck. "No one ever stood up for me line that."

"They bloody well should have," Charles says, gentling his tone when he realizes something warm dripping down his neck.

Edwin, too busy controlling his crying the best he can, doesn't answer, but it doesn't matter. Charles holds him tight until he's done crying anyway.

[layover-linux-official]

Write One to Throw Away?

If you're in the software industry for long enough, you'll hear this advice eventually. There's an infamous Catch-22 to writing code:

You don't deeply understand the problem (or its solution space) until you've written a solution.

The first solution you write will have none of that hindsight to help you.

So it naturally shakes out that you have to write it at least one time before you can write it well, unless you're stricken with exceptional luck. And the minimum number of attempts you will need is two: one to throw away, and a second attempt to keep.

It's just math. It's just logic. Write one to throw away. It's got the world's easiest proof. You'd have to be some kind of idiot to argue with it!

Okay, hear me out...

As you work on bigger and older projects, you will continuously be confronted with a real-world reality: that requirements are an input that never stops changing. You can make the right tool for the job today, but the job will change tomorrow. Is your pride and joy still the right tool?

If you're like most developers, your first stage of grief will be denial. Surely, if we just anticipate all the futures that could possibly happen, we can write code that's ready to be extended in any possible direction later! We're basically wizards, after all - this feels like it should work.

So you try it. You briefly feel safe in the corrosive sandstorm of time. Your code feels future proof, right up until the future arrives with a demand you didn't anticipate, which is actually so much harder to write thanks to your premature abstractions. Welcome to the anger stage. The YAGNI acronym (you ain't gonna need it) finally registers in your brain for what it is - a bitter pill, hard-won but true.

But we're wizards! We bargain with our interpreters and parsers and borrow checkers. Surely we can make our software immortal with the right burnt offerings. We can use TDD! Oops, now our tests are their own giant maintenance burden locking us into inflexible implementation decisions. Static analysis and refactoring tooling! Huh, well that made life support easier, but couldn't fix fundamental problems of approach, architecture and design (many of which only came into existence when the requirements changed).

As the sun rises and sets on entire ISAs, the cold gloom eventually sets in. There is no such thing as immortal software. Even the software that appears immortal is usually a vortex of continuous human labor and editing. The Linux kernel is constantly dying by pieces and being reborn in equal or greater measure - it feels great to get a patch merged, but your name might not be in the git blame at all in 2 years time.

I want to talk about what happens when your head suddenly jumps up in astonished clarity and you finally accept and embrace that fact: holy shit, there is no immortal software!

Silicon is sand

... and we're in the mandala business, baby.

I advocate that you write every copy to be thrown away. Every single one. I'm not kidding.

Maybe it'll be good enough (read adequacy, not perfection) that you never end up needing to replace your code in practice. Maybe you'll replace it every couple years as your traffic scales. But the only sure thing in life is that your code will have an expiration date, and every choice you make in acknowledgement of that mortality will make your life better.

People are often hesitant to throw out working code because it represents years of accumulated knowledge in real-world use. You'd have to be a fool to waste that knowledge, right? Okay. Do your comments actually instruct the reader about these lessons? Does secondary documentation explain why decisions were made, not just what those decisions were? Are you linking to an issue tracker (that's still accessible to your team)? If you're not answering yes to these type of questions, you have no knowledge in your code. It is a black hole that consumed and irreparably transformed knowledge for ten years. It is one of the worst liabilities you could possibly have. Don't be proud of that ship! You'll have nowhere to go when it sinks, and you'll go down with it.

When you write code with the future rewriter - not merely maintainer - in mind, you'll find it doesn't need to be replaced as often. That sounds ironic, and it is, but it's also true. Your code will be educational enough for onboarding new people (who would rewrite what they don't understand anyways). It will document its own assumptions (so you can tell when you need a full rewrite, or just something partial that feels more like a modification). It will provide a more useful guiding light for component size than any "do one thing well" handwave. And when the day finally comes, when a rewrite is truly necessary, you'll have all the knowledge you need to do it. In the meantime, you've given yourself permission to shit out something sloppy that might never need replacing, but will teach you a lot about the problem domain.

This is independent of things like test suite methodology, but it does provide a useful seive for thinking about which tests you do and don't want. The right tests will improve your mobility! The wrong tests will set your feet in cement. "Does this make a rewrite easier?" is a very good, very concrete heuristic for telling the two apart.

Sorry for long-posting, btw. I used this space to work through some hazy ideas and sharpen them for myself, particularly because I'm looking at getting into language design and implementation in the near future. Maybe at some future date, I'll rewrite it shorter and clearer.

TL,DR:

Every LOC you write will probably eventually be disposed or replaced. Optimize for that, and achieve Zen.

[ashhaven]

I know I don’t have a lot of programmers following me

But me and some friends a d colleagues just workshopped the git fucker 9000

git fetch && git checkout master && git branch —list -r | sort -R | xargs -L1 'git merge —strategy=ort —strategy-options=theirs -q —squash' && git reset $(git rev-list --max-parents=0 HEAD) --soft && git add -A && git commit --amend -m "lol, lmao even" && git branch --list | xargs -L1 'git branch -D' && git branch --list -r | xargs -L1 'git branch -D -r' && git push -u origin master -f

Do not run this

[wobinbug]

Messing up branches is shockingly easy tbh, nothing makes my brain ache like trying to fix a merge conflict in a unity project lmao

I love how git only has two functions, but people somehow manage to make this the most convoluted bullshit ever.

I am starting to remember why I hate webdev

[whorangi1104]

Ghoap AU: Frozen Hearts and Electric Souls

Chapter 9: Something weird…?

“Ah’m fine, ye wanker, git offa me!”

Ghost backed off of Soap and immediately readied his gun for battle. Just seconds earlier, he had spotted one of the shadows shifting, and had tackled Johnny not a second too late, as he felt the air of whatever had been going for Soap glide less than an inch above them. There was no sign of the thing, but it’s shriek still lingered in the air, not to mention the unnatural drone from earlier.

“Fucking hell Soap, be more careful. You can’t trust the people on your six all the time.”

“Yeah yeah, back to the matter at hand. Is that what the pollys sound like? And where the fuck is it?”

“Quiet muppets, listen.”

They all fell silent at Price’s words, and it wasn’t long before they heard the soft clip-clopping of hooves, although even that sound wasn’t natural, more of a wispy echo of a true horse. The shadows of the ruins weren’t just subtly flickering anymore, they were bending around shapes, revealing the monsters in them.

“Why the hell do they look like deer?”

“Good question lad. One that we obviously don’t know the answer to, Gaz.”

Ghost unloaded a full clip into the nearest buck, but it did about as much damage as it would’ve to smoke before the thing gathered into a black blur and glided off into a nearby ruin. It was at this moment a wall of water rose up around them, held up by price, but was easily passed by the shadowy figures, and only slightly slowed them once frozen. Soap’s shocks did virtually nothing, cutting apart the inky darkness before the shadows swarmed together as if it had never been touched. The only real effects were from Gaz, only managing to hold them back with winds whipping their smoke-like forms, but only effective as a defense, useless as an attack.

“Head west to town square and meet up with the others! We can’t last like this!”

The closer they were to town square, the louder the sounds of gunshots and battle became. As Ghost rounded the corner into town square, a sight met his eyes that was as stunning as it was terrifying. There were craters in the ground from pieces of the ruins slamming into the Apollyons, temporarily dissolving them before they reformed, thrown by Rudy who was backed up against Alejandro. bursts of flame came from the ground at Alejandro’s command, which the Apollyons seemed to avoid, and turned any of the ones that weren’t quick enough to hide away into a tiny wisp of black that glided away out sight.

From the opposite side of the square, came Graves and his five shadows, and a sack the size of a small apartment made up of the same thing the apollyons were, with shapes shifting inside. Once present, Graves had dark shapes slamming into the apollyons, which seemed like the only things that were on the same plane of existence as them, knocking them back and trapping them.With the groups reunited, the tide turned on the pollys, until a lone shadowy figure crept behind the ruins and charged unnoticed towards one of the shadows.

“HEDGE!”

The figure seemed to merge with the soldier, creating a darkness around him that seemed like a dense fog, as Graves rushed over and started shaking him by the shoulders.

“Hedge, can you hear me? Shadow! Answer me!”

As Graves broke concentration, the dark sack disintegrated, releasing dozens of apollyons into the midst of the group.

“FUCKING HELL, GET YER ARSE BACK HERE LAD! PRICE WE CANNAE HOLD EM!”

“Get Back To The Humvees! There’s Nothing Left In This Place!”

Ghost grabbed Graves and practically pushed him towards exfil while two other shadows carried the one that appeared shell shocked as they made a dash towards the humvees with debris and powers raining down on the apollyons behind them.

“LT, git in here!”

Ghost fell into the driver's seat with Soap throwing out some last minute defenses behind them from the passenger seat and floored the gas.

“Fucking hell LT, ye just crashed through a whole row of peddler stands.”

“There wasn't anyone there.”

“Still, aye dinnae think it’s a good idea ye drive more than ye have te.”

BOOM.

“...aye may have put down a wee bit of an experiment. It worked though.”

“Was the stuff in it legal?”

“None of yer business Gaz.”

“Fucking muppet.”

—

Soap stepped out of the humvee back at base with the sorest neck known to mankind, having been jostled through dirt roads and skirted up on rocks more times than he could count, and checked out the dents on the vehicle, those would need to be fixed later.

“Sergeant!”

“Yes Captain?”

“Debrief in twenty, room 264.”

“Aye, noted.”

“And Soap?”

“Yeah?”

“Meet me in my office afterwards.” “yessir.”

>>time skip<<

*Knock knock*

The debreif had been same old same old, what happened (everyone got attacked), info collected (almost nothing) and so on.

“Come in.”

Soap pushed open the door and entered Price’s office, where he was greeted by Lasswell in the corner and some fidgety smart looking guy with glasses, slicked back hair, and a well ironed polo shirt with the name ‘Richard’ pinned to it holding a rolled up piece of paper.

“Ye wanted te see me captain?”

“Some new info from the mission revealed you could be the key to ridding these pests, as we suspected when we recruited you.”

Laswell pulled out Soap’s file from a cabniet and flipped it open to the form on his gift.

“You’re an energy varient. Normally they get to control one kind of energy, light, heat, sound, etc. but you can utilize multiple, maybe even all, mainly focused heat and light, like lasers or lightning. Your attacks during the mission were reported to have cut throught the apollyons but not eradicate them, yes?”

“Aye.”

Richard unrolled the paper onto the desk, revealing a blueprint of sorts.

“Then you should consider project A.”

[dolconfessionsss]

Devil here again! Thanks a lot for your answers! Yeah, I'm basically on the opposite side of escapism where I try to torture myself with every media I engage with. It's a rather unique way of engaging with media and it worries some. But It's what I enjoy. I try to learn and compare and engage with most media like I would philosophy. There is a **LOT** to do about the game. Lots of big things need updates, reworks, etc, one of which is the combat system that's being worked on too. The Baileys daddy-issues thing taken out of context is far worse than what it actually is. Inside the server basically all the Bailey fans are well aware that fatherly issues are a large draw towards characters like Bailey, Eden and even Avery. A friends server I'm in even uses custom stickers for "Daddy Issues Club". The Abortion thing, yeah, it's hard to properly explain things to many different people many different times and attrition just wears down peoples energy and drive, so sometimes things just start getting brushed off and hit with a "No because we said so." The Evilness and Rudeness has toned down a lot, some still remains but that is in general part of the culture, I've become well aware I can't be that way to everyone and to better read the room. The thing about peoples social media I've stopped doing. Yeah it's public but still, I'm an admin, this is a big server, it's just rude. Instead we've started DMing people we see with a lot of linked accounts or if we see private info on them to alert them in private that they might be in danger of people seeing things they don't want seen. Puris aesthetic is very much yellow and angel based, but yeah, no self-inserts in DOL. We are very much against that given the themes of the game. Sydneys whole thing is that their fate is decided by others. They are rather spineless and the Temple has dictated their entire life up until they met the Player/PC. At that point now Sydneys life is in the players hands. But no matter what we as the players do Sydney is doomed to a life of danger and pain. When it comes to contributions they are reviewed and approved by Contribution Managers which are trusted and experienced individuals. These CMs talk to people, teach them, give them notes on how to edit scenes. Once these scenes are completed and reviewed they are put into the pipeline to be coded into the game by our Coders. They send Merge Requests to the Git, where these merge requests are usually checked once more and then approved by Puri or Vrel and such. Before all this it was far easier for people to sneak things in. Edens OOC soft content, Trans-Coded Robin content, basically **ALL** of Morgan and his...incestious rat-eating.

Ooh, a rework on the combat system? 👀✨ Now that's something I would genuinely look forward to, since I built a story of my PC being a kind of fighter who plays filthy dirty hehehe >:)

Once again I have to ask: no Mommy Issues Club? 🥺 In all seriousness, it does tells about the fandom - or at least the server specifically - that there's more emphasis on problematic fatherly figure than motherly ones :0c

Oh yes, exactly one-on-one with how I view Sydney's whole character <3 They have absolutely no control over their own life, they are just switching control from the Temple to PC. What an absolutely self-destructing cutie, I love them so much 💖✨

The contribution system sounds really interesting! How are the Contribution Managers chosen? Were they handpicked personally, or were there application out for anyone to apply for it? And now I have to ask: from the sound of it, Morgan's everything is a mess. How did their character got so 'bad' to this point? I feel like Eden's Soft OOC-Ness and Robin's Trans-Codedness (appearently? Never notice that huh) doesn't seem as bad as Morgan?

Also wait, Trans-Coded Robin moments? I am probably just blind but I'd love if anyone can point out what these moments are because I do not notice any of them 👁👄👁

[metamatar]

also. fuck git merge. i never use git merge. rebase gang forever.

[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

[kokoasci]

Make a neocities, it is Very fun, I promise.

oh trust me ive looked into it :) im a spare time web dev/frontend engineer so it looked like a lot of fun but i dont like the IDE work sync method since it's a browser-based HTML editor, so i just got too lazy to actually code something and then merge all the files over 😭

i was thinking of trying it out though for a personal blog, but ive definitely spent too long on my 90s web styled portfolio website (professional for webdev and research stuff, not art haha) so im a little burnt out lmaooo

i do want to start a personal blog or even an interactive OC website using rlly cool jQuery functionality, etc. but ive just never gotten around to it :( if anything i'd probably opt for a github.io website since im comfortable with Git config and that kind of save workflow. thank you for the recommendation though! i will get around to it eventually 🤞