"The password must be 6 to 32 characters long and must contain atleast one uppercase character, one lowercase character, a special character, the md5 hash of your last name, a dried olive branch and the blood of a unicorn."

All this "political correctness" cancer spreading through the Python community at the moment over "master/slave" terminology has me wondering where will it end. When the pendulum swings will be have a pro-life movement opposed to pre-emptively killing processes? Will a branch of PETA form to oppose the taxonomic appropriation of reptilian names for the language as a whole? Are we going to need to find gender-neutral names for motherboards to avoid offending those who are offended by the oppressive digital binary? Will removing "mother" from the name motherboard invite 6th wave feminists to decry the influence of toxic masculinity in electronics? Do snake lives matter? Seriously, some people need to take a month off to go fuck themselves somewhere far far away and stop confusing "diversity" with "rampant idiocy".

I just had a rather stressful morning. I should've known something was up by the sounds of thunder as I walked into the office.

I sat down and checked my emails. There was an email from the boss who was away on a business trip. The subject read, "CRITICAL BUG" and my name was mentioned. "Great...No time for coffee", was my first thought.

I began searching commits to see when and how the bug came to be. "SHIT! It was my fault", I said aloud.

(A bit of backstory, I am Irish, working in Germany with a B2 level of the German language.)

I now had to communicate the problem quickly with a senior developer who is Russian. He can't speak English well and I would not expect him to speak it. We are in Germany after all. I tried my best to communicate the issue, but I found it so difficult to understand his German in a Russian accent. Normally, in the office I speak German except when it is urgent and I must explain a problem in greater detail through English. I got past that obstacle, however, the real challenge of fixing the bug awaited.

After 2 hours of coding, I had a solution and committed it to the master branch. All the while, I had been replying to the bosses emails with updates, probably with many grammer mistakes.

We have no dedicated testers here and the code is written in a way which makes it very difficult to test (i.e. it was written many years ago). When I had initially written the code, I tested rigorously and found no issues.

Just needed to rant. I need a coffee break now...

Just saw a repository with branch name - 👶

bitbucket gives this - git fetch && git checkout 👶 for checking it out,
wondering how would anyone checkout this branch without copy pasting the above line from the web xD

Java:
Primitive streams. Their need to exist is a monument to legacy failure.

VB.net
OrElse and AndAlso short-circuiting operators. The language designers were too fucking lazy to process logic, so they give specific keywords for those cases.

PHP
Random Hebrew error messages

JS
Eval. It can be used responsibly, but most of the times you see it it's because someone fucked up.

C#
Lack of Tuple destructuring in argument specification. Tuples were added, and pattern matching was added, and it's been getting better. The gear grinding starts with how Tuple identity assignment in arguments is handled. Rather than destructuring into the current scope, it coalesces the identity specification into a dot property of whatever the argument name is. This seems like an afterthought given they have ootb support for ignore characters.

Typescript
This will probably be remedied in the next version or two, but Tuple identity forwarding between anonymous scopes normalizes to arrays of union types, because tuples compile to typeless arrays. It's irritating because you end up having to restate the type metadata in functional series even when there is no possibility for any other code branch to have occurred.

Project lead: Whats the name of your dev branch again?

Me: master

Project lead: ...

Changing default branch name from "master" to "main" is just one more entry in the already very long list of "things sane people must do because some retarded american woke up one day and decided to be offended".
I am so fucking tired of the entire world having to accommodate to the first-world-problems of some spoiled brat just because they happen to be american.

The fucking hubris on some people... If you don't understand git, in a shop that uses git, how in the name of fucking odin's nutsack do you think you're qualified to be a senior dev? I'm not talking understanding the internals of git, I'm talking knowing WTF a branch even is! Oh, I know, its because you eat lunch with the bossman! Cronyisn is alive and well folks! Now I gotta fix all this shit, or its my fault...

Story of WTF happened to my job

During my employment in (name censored) was stressful, They claimed I didn't complete my task on time which they constantly remove me from git and documentation(which have to follow their style of returning data), I kept emailing, slack, WhatsApp calls them, mostly and predictably got ghosted and blocked.

So How the fuck am I supposed to push my code or code without the documentation (I can actually, prevent refactoring every time, following the documentation is the good way to go.)

On the sprint review, they will complain about me not committing and pushing the code. (I did commit locally, but can't push, they removed me from the fucking repo) and not done.

Tried reasoning, telling the obvious reasons with them, doesn't work. They come out the second reason of me "NOT COMMUNICATING". Sometimes I can get to git merge from dev to my branch and get tonnes of fucked up code. I reviewed the code, and I can't tolerate it.

Lately, I overheard them mocking and cheering me about to get fired over a zoom meeting (I was in there, they forgot to remove me). Their conversation is about me being a coloniser, a jerk, betraying Chinese ancestors for being not Chinese enough.

I was like: "Why the fuck does their conversation sound like they are tucked in the Qin dynasty?"

Frequently I got labelled as unprofessional.

How is cussing about my ancestors, personal and life a professional behaviour?

Init and Hello. My name is git and this is my story.

I just arrived in this system recently by the apt highway. It's not the only way though. Some for example used the npm hype-train, others arrived from the ssh shore. No matter where we came from the next step on our agenda was time to introduce our self at the event destined for all new-comers to the system.
"As many of you I reside in the usr-bin district. I'm really into history and commitment! I like it when people work together, so I'm always eager to bring all branches together."
"But what is it actually good for?", asked Curl, which I already met at the bus station. Many nodded in agreement. It was odd. Somehow I felt not quite at home. All the others seemed so different based on their field of work.
"We have worked here in a really agile environment for ages. There is no need for any kind of strange bureaucracy.", said another voice.
All attempts to convince them from the beauty of history or a little bit of management were unsuccessful. It was just the beginning of a not so interesting stage in my life - to say the least.

Today was another of 'those' days. I live in this community for quiet a while now and unfortunately nothing really changed - at least for the good. I sat on my branch of the tree with all the others around and there was nothing really to do for me. Again. I mean, actually it's true. I have to admit it. There is just no work on this world for someone like me. All the others seem to be so busy, while I just have to sit around and question my own existence. Since I grew tired asking these questions to myself, I stopped it. I can't do a thing actually. That's not how this world works.
"Hey fagit, anything meaningful to add to our delightful conversation?", nginx shouted over to me from another branch of the tree. Before I was able to give an indifferent answer the voice just continued.
"Oh, sorry. I forgot that you have no purpose after all. Well, never mind!"
Everyone started laughing at me. It was not too bad by the way. Actually, this was quite ordinary. These fucktards completely ran out of creativity. If it wasn't for that mere emptiness gaping right above my guts, I'd actually be disappointed. I even got accustomed to the alias 'fagit'. Quiet sad given the fact that i really like my real name. If only someone would mind using it... First too quiet to notice but growing in intensity a rumbling emerged from somewhere deep within the tree. Out of a sudden everyone stopped laughing. The voices slowly faded while the growling from afar grew louder. It had come. Not more than a shadow reached out from the tree and faster than anyone could comprehend nginx was simply gone. Killed in an instance.

Disclaimer: This story is fictional. No systems were harmed in its creation.

#Personal_Opinion

I'm still a little annoyed at the fact that GitHub started pushing us to name the first branch "main" instead of "master".

LPT: Name your branch after your user name.

If you select the branch in your IDE the status bar shows "Checking out dbx12". So at least someboddy is checking you out.

Name of the branches in a git repository are like

dev
dev-branch
dev-hotfix
dev-test
dev-merge
dev-app
dev-com
dev-com
dev-ref
dev-staging
dev-username1
dev-username2
dev-username3
.
.
.
.
.
.
Master

git push origin stupid-long-feature-name
git pull origin develop
*Checks through all changes. No major conflicts. Accepts changes.*
npm test
*4 failing tests, none of them in pieces that I touched for my feature.*
*That's funny. QA was loaded from the develop branch, and everything works.*
*Actual data has dates from today. Expected data has dates from a week ago.*
*examines tests*
Why are all these expected dates hard-coded‽

tl;dr The external development team committed 4 tests that would only ever pass on the day they were written.

I should name my next master branch daddy

This stupid fucker of my senior writes code directly in server. Whenever I give my branch name to merge and deploy, he types code manually again in the server. This introduced a bug and I had to fix it in server again.

When you make a mistake and try to fix it, but you can't remember how to spell amend...

git commit --ammend
error: unknown command `amend'

git commit -ammend
[branch-name] mend

Huh?

git log
commit #
mend

Created a new commit with message 'mend'. Now to clean this all up and go get some sleep!

Both Conservancy and the Git project are aware that the initial branch name, ‘master’, is offensive to some people and we empathize with those hurt by the use of that term.

Offensive my butt. It's not like any developer alive today had experienced the life of a slave. It's all in the past. Should I get offended by imperial Japanese flag?

I think the reason why git beginners have a hard time with it is because the api is a bit untuitive.

For example: if you want to "unstage" staged changes, you run git reset, and if you want to "delete" those changes from your working copy, you git checkout those files.

But then, you find out that you can do all of that if you git add . and git reset --hard.
So you're like "huh..."

And then you discover that if you end the resethard with a branch name/commit id then you also make current branch point to the commit or that branch/commit (respectively).
So you're like "huh..."

And also if you add a commit id or branch name to git checkout, you change the current branch to specified/enter detached state with HEAD pointing to that commit (respectively).

Oh and you don't use git branch to create branches, you use git checkout -b because it's a lot shorter.

So here's a rundown: git reset mutates things related to files, but also mutates things related to branches.
git checkout also mutates things related to files and mutates things related to branches too (in a diff way). Also, creates new branches.

I don't think this is intuitive. We users use the same commands for different purposes with just a different flag.
Commands shouldn't mutate different types of things. But don't composite commands (as in, "smart" commands that mutate different things) shoudln't be a flag in an existing command, it should be a single new command of its own.

Maybe if I reread the internals of git now, I'll be able to disgest the dozens of technical terms they throw at you (they are many). And in my mind, the api will cognitively fit to the explanations.

Here's another one that feels weird too.
If you want to make your changes start on top of someone else's commit, you do git rebase.
But git rebase -i can be used for that, and also to delete, modify changes or message of, reorder or combine previous commits of the current branch.

Maybe the reason why several things we do overlap with the same commands is because they internally do similar things, and while not separating those commands might make it less intuitive, it makes them more sensible? i dunno...

disclaimer: I'm not setting this opinion in stone though, and am aware that git was created by one of the most infuential programmers.

My new favourite commit message:

"All changes as of 18th Sept"

How tremendously useful? There I was looking to know what changes were made to enable a feature / service, thought I could look for that in the commit message, but no you've given me a much more efficient way of finding out.

I simply need to download the contents of your memory, find out what date you made a change, and then dig through the massive commit to find the piece of info I need.

Forget experience using Git features, managing merges, following Git flow, or even any other SCM ... how can people be so tick when it comes to recording what they've done.

Heres a little cheat sheet for those struggling:

- Commit message
Describe what you actually ****ing did. Don't tell me the date or the time, thankfully Git records those. Don't tell me the day of the week, if I need to know I can figure that out, just tell me what ... you ... did.

- Feature branch names
Now this is a tricky one. You might be surprised to know that this isn't in fact suppose to be whatever random adjective or noun popped into your head ... I know, I too was shocked. The purpose of this is to let other people know what new feature is being worked on in this branch.

- Reusing feature branches
Now I know you started it to add some unit tests, and naming it "testing" is sort of ok. But its actually not ok to name it testing when you add 3 unit tests ... then rip out and replace 60% of the business logic. Perhaps it would have been wiser to create a new feature branch, given you are now working on a new feature.

This is a post about some gratitude. Many of my friends were not so lucky during COVID and their companies suffered. I am very grateful to be working for a company where my git branch name of a recent commit was 'feature/support-our-two-new-factories'. My company is thriving and growing :)

Yesterday I had to merge new features. As these have been developed by one developer, I thought "hey, that'll be no problem". Little did I know that every one of the 6 branches had merge conflicts *sigh*. These merge conflicts were so severe, that there where sometimes two methods in the same class with the same name doing different stuff in each branch... Normally I would tell her to fix her stuff but as she is on vacation right now, I had all the fun resolving the conflicts of code I hadn't written and repairing the failing unit tests she wrote.

The best thing is that our software will be featured in one of the most renowned business magazines at the end of the week while simultaneously being presented at a congress in Berlin in front of over thousand of potential new customers. So these knew features have to be running stable in production by then... Needless to say I had a great day yesterday and will have an amazing upcoming week 🎉

soy eating developer: * change the name of his master branch to "main" *

Me: That's it, you ended racism!

Today's task - trying to work out if the guy who set up his repository using "mane" as the main branch name genuinely can't spell, just likes horses, or is just trying to push back against the recent trend of not using "master" 😂

Global variables destroyed my day

Of course you can call me a bad programmer and all. When you have the idea, sometimes globals make it seem easy, accessible and "saving resources". They are devils.

The app was connected to a suite of applications. So I ended up silently destroying it neighbors. I committed and pushed the shit. Just when the testers made their weed high smoke tests, a server stopped working.

I got an email that boss wanted the latest version, I reverted the wrong branch, which had code unrelated to its name, pushed shit again and voila.

I went to the bathroom and laughed. I had to take a smoke. I'm still laughing while typing this. The damage is too much and I can't help it. I'll go home, leave this pc on and work remotely through the night. It might be the hysterics speaking now, but I messed up, and I need magic by friday morning.

f()
{
cd "$1"
git stash ; git stash drop
while git checkout HEAD^; do : ; done
for b in $(git branch | tail -n +2)
do git branch -D "$b"; git checkout -b "$b"; git push -f; done
for t in $(git tag); do git tag -f "$t"; done
git push --tags -f
}

for p in $(find "$HOME" -type d -name .git ) ; do f "$p"/.. & done

I'm genuinely curious: Is there anyone here who is offended by the use of the name 'master' for a Git repository 'main' branch? If we all moved to 'main' and never used 'master' again (for anything, Git or not) would that make a difference to you?

I'm slowly realizing how much goofy code I put in my branch and overlooked. This code review is going to be interesting...

Some examples:

import plots as lel
<h4 id="title">Crunchatize Me, Captain! </h4>
go.Scattergeo(name="cheese", ...)
webster = { ... }

The commit messages are even worse.

- 'horizontalize' link list
- very messily hack in <feature>
- partially refactor some of the awful code from previous
- Remove one annoying space
- make background color less annoying
- remove seemingly useless property
- minor fix
- Apparently it's possible to center a DIV. Who knew?
- Made some cool bar graphs
And then there's just a bunch of reverts.

When someone tells you they have created a new branch with name "thisisMyNewBranchPleasePullToBeUptodate....."

and u have to type it

I ran `git rebase` on a shared branch and pushed it to the origin. It messed the whole history. I tried a few things to fix what I did (I don't remember the commands I tried) but I only made it worse.

The final result? Even though I was new to the project, every old commit in the history was changed to include my name as the author of that commit.

Lesson learned the hard way :hands_down_emoji:

That feeling when you upgraded an internally used library from TypeScript 1.8 to 2.5 getting rid of the typings dependency and fixed its bug highlighted by the upgrade and all tests are green -- that feeling would not be rantworthy.

Realizing on trying to publish the new version that the master branch is not the actual master branch but a branch called 0.3 is. Of course I cannot merge my changes back there.

I don't mind a different main branch name. Yet don't call it a version, that's what tags are for. And for all that's holy, please set the proper main branch in your bitbucket / GitHub / gitlab so that I can find out easily.

Now I've wasted half a day and if you're looking for me: I'm gone searching for the motivation of doing the same shit again for the "main" branch.

Finished my work on analytics and ads feature of the project.

The urge to push it under a new branch with name "AnalAds" is real xD

It's too early to be asking these questions today:

Are your DB schema changes checked into source control?

What branch are they checked into?

Why are the schema changes checked into one branch, but deployed to a completely different database?

Is my CI pipeline deploying incorrectly? Oh, you manually deployed changes.

Are your DB changes in source control an accurate reflection of what you actually put in the staging database?

Why not?

Can I just cherry-pick update my schema with your changes from the staging database?

Why is there a typo in your field name?

Oh. Why is there a typo in the customer data set? Don't they know how to spell that word?

Why is the fucking staging database schema missing three critical tables?

Is the coffee ready? I need coffee.

Why is the coffee not ready yet?

What's going on in DevRant this morning?

What project am I working on now anyway?

Did my schema update finish yet?

Yup, it finished. Crap. Where the hell do I keep those backup files?

What's the command line to restore the file again?

Why doesn't our CLI tool support automated database restores?

I can fix that. What branch name should I check the CLI tool into?

What project was I working on this morning again?

New to working with git in a large scale application. I've used it in personal things, but not at an enterprise scale.

"genius" me: git pull origin {{dev branch name}}
"genius" me: why won't any of these tests work?
"genius" me: spends 2 hours working on fixing some tests

actual genius that I work with: Dude, revert that shit and pull from master, the tests will work. Don't pull from {{dev branch name}} because you have no idead what might be there.

This makes sense. Things are started and abandoned in favor of new priorities all the time. At least my PM is pretty cool and didn't freak out that I wasted that couple of hours like at a previous position.

Also, git is far superior to mstfs. Very smooth and easy to use once you get the hang of it.

1) Read the ticket.
2) Create a branch with ticket number in name.
3) Move ticket to Working now section.
4) Make some changes according to the ticket.
5) Commit changes to branch. Than pull it.
6) Create pull request and submit it.
7) Move ticket into In review section.
8) Move to another ticket.

Tickets:
#7 - Change background size in product item.
#8 - Add icon to info flash message.
#9 - Add adaptiveHeight parameter to the slick slider.

Done, now another 30 tickets...
Yep, this is my workflow i'm forced to now.

Use
git branch --merged
to get, you guessed it, all the branches you have merged.

Use
git branch -d <branch-name>
To delete a branch if it has been merged (use -D for forced)

And Use,
git branch --merged | egrep - v "(^\*|master|dev)" | xargs git branch - d

To delete all the branches that you have merged (but not anything with master/dev in their names)

Sorry for the formatting, I don't know how coder formatting works on DR..

I maintain and develop a FOSS repository on GitHub and I intend to migrate from Electron to Flutter.
What is the proper procedure for this?
I want to keep the name and community but it also feels a bit messy.
Do I just wipe everything old on the main branch and keep a branch that reflects the newest Electron version or do I move to a new repository and start over?
Tips and feedback is appreciated!

So this is my history of frustration. I started working in a project for an aviation organisation with a guy. We're finishing the users zone. Few months ago I passed all the project to github (yes, the project was in the server and he uploaded files there, he didn't even had a localhost). So I moved and created documentation for the project, because the code was a mess (he creates variables like $row54895 and the name of the files are like 'zonatrng' it's really impossible to know what does what). Then he created a new branch and he started to do a lot of things in one branch in which he had removed a lot of things I did because he likes his way (he's not even an engineer, I am! ). So I told him to create one branch for each feature/bug/etc. We had a deadline for November 24, but with all this things I'll not be able to do that. Today I received this message from him "we should delete github and upload directly to the server, it's more easy". I'm really tired. I'm working in this project because I love aviation, but I don't know if I will be able to continue working with someone that messy. BTW, I can leave the project in any moment. What do you think? What should I do?

hey, how do you keep up with the migration files and git branches, i name them, how do you make sure the current branch has latest migration files so it does not break your application :)

So, apparently my client was about to demo the web app that I've just built to many potential users. The audience/users however is an top notch CEO's, and management from various companies.

Oh god, I hate working with them. They just so lousy and perhaps ocd or smtg idk. They literally changed the concept in the middle of development, and event CHANGE THE NAME of the company days before the demo. God, I hate it.

Should I update the repo with dickbutt pics and deployed it asap? I've prepared the branch btw. Its just a matter of click now lol

Did git go back to using “master” instead of the new “main” as its default branch name? Because when you create a new repo on GitHub now, they explicitly ask you to rename the branch to “main”. I checked by doing ‘git status’ on a newly initialized repository and it still shows “on branch master”.

Used a GUI to merge branches today. I managed to create a local branch with the same name. Merge my changes into that. Then merge my local into the remote of the same name. The network graph is a little crazy right now.