#git merge

[vivektech]

Use Git if: ✅ You need speed and distributed development ✅ You want better branching and merging ✅ You work offline frequently

[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

[peeterjoot]

git diff against previous

[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]

[codingquill]

Welcome back, coding enthusiasts! Today we'll talk about Git & Github , the must-know duo for any modern developer. Whether you're just starting out or need a refresher, this guide will walk you through everything from setup to intermediate-level use. Let’s jump in!

What is Git?

Git is a version control system. It helps you as a developer:

Track changes in your codebase, so if anything breaks, you can go back to a previous version. (Trust me, this happens more often than you’d think!)

Collaborate with others : whether you're working on a team project or contributing to an open-source repo, Git helps manage multiple versions of a project.

In short, Git allows you to work smarter, not harder. Developers who aren't familiar with the basics of Git? Let’s just say they’re missing a key tool in their toolkit.

What is Github ?

GitHub is a web-based platform that uses Git for version control and collaboration. It provides an interface to manage your repositories, track bugs, request new features, and much more. Think of it as a place where your Git repositories live, and where real teamwork happens. You can collaborate, share your code, and contribute to other projects, all while keeping everything well-organized.

Git & Github : not the same thing !

Git is the tool you use to create repositories and manage code on your local machine while GitHub is the platform where you host those repositories and collaborate with others. You can also host Git repositories on other platforms like GitLab and BitBucket, but GitHub is the most popular.

Installing Git (Windows, Linux, and macOS Users)

You can go ahead and download Git for your platform from (git-scm.com)

Using Git

You can use Git either through the command line (Terminal) or through a GUI. However, as a developer, it’s highly recommended to learn the terminal approach. Why? Because it’s more efficient, and understanding the commands will give you a better grasp of how Git works under the hood.

GitWorkflow

Git operates in several key areas:

Working directory (on your local machine)

Staging area (where changes are prepared to be committed)

Local repository (stored in the hidden .git directory in your project)

Remote repository (the version of the project stored on GitHub or other hosting platforms)

Let’s look at the basic commands that move code between these areas:

git init: Initializes a Git repository in your project directory, creating the .git folder.

git add: Adds your files to the staging area, where they’re prepared for committing.

git commit: Commits your staged files to your local repository.

git log: Shows the history of commits.

git push: Pushes your changes to the remote repository (like GitHub).

git pull: Pulls changes from the remote repository into your working directory.

git clone: Clones a remote repository to your local machine, maintaining the connection to the remote repo.

Branching and merging

When working in a team, it’s important to never mess up the main branch (often called master or main). This is the core of your project, and it's essential to keep it stable.

To do this, we branch out for new features or bug fixes. This way, you can make changes without affecting the main project until you’re ready to merge. Only merge your work back into the main branch once you're confident that it’s ready to go.

Getting Started: From Installation to Intermediate

Now, let’s go step-by-step through the process of using Git and GitHub from installation to pushing your first project.

Configuring Git

After installing Git, you’ll need to tell Git your name and email. This helps Git keep track of who made each change. To do this, run:

Master vs. Main Branch

By default, Git used to name the default branch master, but GitHub switched it to main for inclusivity reasons. To avoid confusion, check your default branch:

Pushing Changes to GitHub

Let’s go through an example of pushing your changes to GitHub.

First, initialize Git in your project directory:

Then to get the ‘untracked files’ , the files that we haven’t added yet to our staging area , we run the command

Now that you’ve guessed it we’re gonna run the git add command , you can add your files individually by running git add name or all at once like I did here

And finally it's time to commit our file to the local repository

Now, create a new repository on GitHub (it’s easy , just follow these instructions along with me)

Assuming you already created your github account you’ll go to this link and change username by your actual username : https://github.com/username?tab=repositories , then follow these instructions :

You can add a name and choose wether you repo can be public or private for now and forget about everything else for now.

Once your repository created on github , you’ll get this :

As you might’ve noticed, we’ve already run all these commands , all what’s left for us to do is to push our files from our local repository to our remote repository , so let’s go ahead and do that

And just like this we have successfully pushed our files to the remote repository

Here, you can see the default branch main, the total number of branches, your latest commit message along with how long ago it was made, and the number of commits you've made on that branch.

Now what is a Readme file ?

A README file is a markdown file where you can add any relevant information about your code or the specific functionality in a particular branch—since each branch can have its own README.

It also serves as a guide for anyone who clones your repository, showing them exactly how to use it.

You can add a README from this button:

Or, you can create it using a command and push it manually:

But for the sake of demonstrating how to pull content from a remote repository, we’re going with the first option:

Once that’s done, it gets added to the repository just like any other file—with a commit message and timestamp.

However, the README file isn’t on my local machine yet, so I’ll run the git pull command:

Now everything is up to date. And this is just the tiniest example of how you can pull content from your remote repository.

What is .gitignore file ?

Sometimes, you don’t want to push everything to GitHub—especially sensitive files like environment variables or API keys. These shouldn’t be shared publicly. In fact, GitHub might even send you a warning email if you do:

To avoid this, you should create a .gitignore file, like this:

Any file listed in .gitignore will not be pushed to GitHub. So you’re all set!

Cloning

When you want to copy a GitHub repository to your local machine (aka "clone" it), you have two main options:

Clone using HTTPS: This is the most straightforward method. You just copy the HTTPS link from GitHub and run:

It's simple, doesn’t require extra setup, and works well for most users. But each time you push or pull, GitHub may ask for your username and password (or personal access token if you've enabled 2FA).

But if you wanna clone using ssh , you’ll need to know a bit more about ssh keys , so let’s talk about that.

Clone using SSH (Secure Shell): This method uses SSH keys for authentication. Once set up, it’s more secure and doesn't prompt you for credentials every time. Here's how it works:

So what is an SSH key, actually?

Think of SSH keys as a digital handshake between your computer and GitHub.

Your computer generates a key pair:

A private key (stored safely on your machine)

A public key (shared with GitHub)

When you try to access GitHub via SSH, GitHub checks if the public key you've registered matches the private key on your machine.

If they match, you're in — no password prompts needed.

Steps to set up SSH with GitHub:

Generate your SSH key:

2. Start the SSH agent and add your key:

3. Copy your public key:

Then copy the output to your clipboard.

Add it to your GitHub account:

Go to GitHub → Settings → SSH and GPG keys

Click New SSH key

Paste your public key and save.

5. Now you'll be able to clone using SSH like this:

From now on, any interaction with GitHub over SSH will just work — no password typing, just smooth encrypted magic.

And there you have it ! Until next time — happy coding, and may your merges always be conflict-free! ✨👩‍💻👨‍💻

[serinemisc]

So I came across this recently.

It's funny, because I think I exactly half agree with it. I do rebase-heavy workflows in Git mostly because every single Git client makes merge-based workflows ugly and hard to use. If GitHub simply displayed merges the way it displayed squash-merges, that would eliminate so much of the need for squash-merges.

But I don't think this covers everything. So let me go through every use-case for rebase separately:

git merge --squash

The squash-merge is one of the most popular ways to merge pull requests on GitHub, and it's an abject failure of the Git ecosystem that it's so popular.

When you do a regular merge on a pull request, you are essentially taking a bundle of commits from somewhere else, and putting it on top of your own main branch. It's an extremely linear thing to do.

But if you do that, GitHub's commit log just gets a bunch of commits interspersed throughout, with zero indication where they're from. And the nicer clients, if they do, visualize it as a tree (pronounced "DAG") (pronounced "a huge tangle of curvy lines"):

This pic is from an article telling you to rebase, and, like, sure, rebasing sure is one way to work around a UI that displays your merges as a huge tangle. But Fossil makes a really good point. Why not instead display your merges as, like, not a huge tangle? git log --first-parent does this (and that's clearly an option in that Git UI), but it should be the default everywhere. And even when expanding the "bundle", the bundled commits should still be grouped together, not interspersed with other commits at essentially random.

The other issue is that, when showing the "tangle of commits", the reason it's so tangled is because it's showing the commits in chronological order of when the commits were made. Which is a completely useless sort order, compared to, say, chronological order of when they arrived in the current branch (i.e. grouping the merged-in commits together). This is why GitHub's rebase-merge is also such a popular alternative to merges.

git pull --rebase

Okay, so. Now you've fixed commit log visualization of merged pull requests. But that's not the only use of rebase! Here's another one: if you're working on some code, and constantly keeping it synced with remote, you'll generate tons of merges that are complete useless noise. Unlike a merged PR, these should ideally be hidden completely, or at least nearly-completely.

Anti-rebase people say that these merges serve the functionality of, like, preserving history. You made one commit when the remote was in this state, and another commit when the remote was in that state, and this is sometimes important history to preserve.

I think they are way overestimating how important that history is (judging by how many people use pull-rebase). I'm fine preserving that history if you can declutter the UIs, but it does require your UI to be able to distinguish between "important" merges (of new features from feature branches) and "unimportant" merges (keeping branches in sync with remotes).

The linked post doesn't talk about this problem at all, so I don't know how well Fossil handles this.

git commit --fixup

That leaves the amend/fixup commit. The link does mention that Fossil supports editing past metadata (e.g. commit message). But sometimes you want to edit the actual changes of a commit.

Now, for a sufficiently published commit, this is a bad idea. But if you have a habit of "commit early, commit often", having 50 bugfix commits makes a commit log really cluttered.

I frequently, like, have to weigh stuff like "is it worth cluttering the commit log to fix one typo in one comment?" for old code. And it would really suck to also have to do that for unpublished code, instead of going in with my trusty rebase scalpel.

git that's all I wanted to say

In conclusion. git rebase is a solution to a number of things that could also be viewed as UI problems, and fixed in other, better ways, and Fossil sure sounds like it's fixed some of them. But some of those UI problems are legitimately hard, and I'm not convinced Fossil fixes all of them, and GitHub extremely has not, so I'm gonna keep rebasing.

[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.

[scannys-back]

(Sean appears right outside of Ethan's home, knocking on the door once again as he stands there waiting)

Yo, little brother!

It's that time again! Both our mods know what we want so let's go back to that place!

I'm certain you'll be able to beat my ass if you're gonna get serious!

*Ethan walks outside slowly and teleports them both back to the merged digital location and turns death off again*

Alright then.

*Ethan spawns in something.*

Trollos.

Let's start simple.

*Ethan has equipped the THE_NUT_BUSTER*

*Ethan duplicates it*

Have fun.

*Ethan starts making many, many, many, MANY clones of himself all with with their own hammer's.*

Hey fun fact!

You're about to get dunked on. M80.

Git fuk'd.

*the entirety of everything turns into... THIS abomination of a ENDLESSLY moving hell of Scannys face.*

*all of the clones raise their hammers and try to bash Sean with them, as some clones stun lock Sean up close with them all commiting various combo's from various fighting games, not even letting Sean hit the ground.*

[etirabys]

81k in a conversation about what size of change a single git commit should encapsulate: I don't have strong opinions about this, though. The one git thing I do have strong feelings about is merge vs rebase. I always rebase if I can.

me: Yeah, I find rebases easier to reason about even though I know the two are really similar.

me: Merging… it's like eukaryotic sex. You shouldn't do it unless you have to.

[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 👁👄👁

[techav]

On Keeping Good Habits

I, like everyone else with any productive hobby, have more ideas and things I want to try than time and skill to implement them. I'll start on developing something and then either life or that next great idea comes by, then suddenly whatever I was working on is lost to time, usually in some sad partially-implemented state.

For projects like mine, modern source control is a godsend. New idea? Create a branch. If it works out, merge. If it gets abandoned, forever stare wistfully at the branch that went nowhere that can't be deleted because surely inspiration & inclination will one day lead back to it (it won't).

Of course for that to work one has to ... use ... source control.

I have a GitHub account. I have repositories for my projects. I even have some branches for developing new ideas.

My recent multi-user BASIC kernel was developed on a working branch on the repository for that particular homebrew project. And I branched off that to add a supervisor console to the kernel.

And when I got it working I ... went straight into developing a new idea without so much as committing the working version to the development branch.

Once I got the machine running again last week, I had some minor changes I wanted to make to the kernel code. Which of course is when I realized what I had done.

What followed was hours of trying to bring together the last unstable commit and the current incomplete mess. I even pulled out ghidra to disassemble the one good ROM I had to compare against. Hours of reverse-engineering my own project to figure out what I had done, instead of adding the new feature I wanted to add.

All because I hadn't kept up with my repository.

I've cleaned up the mess, and was able to get the code back to compiling byte-by-byte identically to what was on the good ROM. But that time is gone. It's not likely I'll be making the same mistake again any time soon.

Sometimes good habits come from lessons hard learned.

(and the real hell of it is — I use git for my paying job every day and would never make such a mistake there...)