Git.

The smallest utility made its way to being the largest companies must-have, the most critical part of the whole development landscape.

Using just plain C, Git can shred huge amounts of data insanely fast. It never gets old.

Git is a developer's scalpel.

This was during the first day of my first real dev job, straight out of college. I didn’t have have much experience with version control since I did mostly solo projects in college, and I wasn’t exposed to SVN or Git in school at all.

One of the senior devs was going to give me and another new guy a brief overview of the codebase. He sets us up with the GitHub repo for the codebase and tells us to clone the codebase locally. I didn’t really know what this meant but I felt kind of embarrassed to ask, so I just clicked “download as zip” on The GitHub repo.

After a minute he saw what I had done and was like “yeah, that’s not what you want to do” and showed me how to clone it. I was kind of embarrassed but I learned Git pretty quickly after that.

I don’t really have a moral to this story except that “no question is a stupid one” is much easier said than done for many people, and it can be embarrassing to ask certain questions sometimes.

Modern web development is fucked. Just absolutely, totally screwed up.

I want to create a simple to do list web app. Look for a tutorial: "OK guys, this is really easy, it just takes five minutes."

First step, install these:
- Git
- NPM
- NodeJS
- Express
- MongoDB
- Docker
- React

Second step, npm install about one million modules. Don't question what they do or why they're there.

Before you know it, six hours have passed and you've got a code base of 3GB and you haven't even _started_ on your app.

FUCK that shit! I can create this web app with Internet Explorer and Notepad.

When you stare into git, git stares back.

It's fucking infinite.

Me 2 years ago:
"uh was it git fetch or git pull?"

Me 1 year ago:
"Look, I printed these 5 git commands on a laptop sticker, this is all I need for my workflow! branch, pull, commit, merge, push! Git is easy!"

Me now:
"Hold my beer, I'll just do git format-patch -k --stdout HEAD..feature -- script.js | git am -3 -k to steal that file from your branch, then git rebase master && git rebase -i HEAD~$(git rev-list --count master..HEAD) to clean up the commit messages, and a git branch --merged | grep -v "\*" | xargs -n 1 git branch -d to clean up the branches, oh lets see how many words you've added with git diff --word-diff=porcelain | grep -e '^+[^+]' | wc -w, hmm maybe I should alias some of this stuff..."

Do you have any git tricks/favorites which you use so often that you've aliased them?

Dev: what do I call this file ?
Me: just name it something meaningful so other dev's know what it is

Two days pass

Me: time to do code review .. oh look a new file ..

Git comment : new file for sax parsing , architecture gave the ok.

File name : SomethingMeaningful.java

Roughly 180 days, 5 months and 29 days, 4,320 hours, 259,200 minutes, I devoted myself to a client project. I missed family outings with my daughter and my wife. People started asking my wife if we had broken up. My daughter became accustomed to daddy not being around and playing with her. Sometimes only sleeping 4 hours, I would figure out solutions to problems in my sleep and force myself to wake and put them into action. My relationship with my wife became very fragile and unstable. I knew I had to change but I just needed a little bit more time to complete this client project.

Finally, the project was ending there was light at the end of the tunnel. I “git add –-all && git status” everything looked good. I then “git commit -m “v1.0 release candidate && git push beanstalk master”

I deployed the app to the staging server where I performed my deployment steps. Everything was good. I signed-up as a new user, I upload a bunch different files types with different sizes, completed my profile and logged out. I emailed the client to arrange a time to speak remotely.

“Hello” says the client “How are you” I replied. “Great, lets begin” urged the client. I recited the apps url out to the client. The client creates a new account and tries to upload a file. The app spews a bunch of error messages on the screen.

The client says

“Merlin – I do not think you really applied yourself to this project. The first test we do and it fails. If you do not have the time to do my project properly please just say so now, so I can find somebody else who can”

I FREAKED THE FUCKOUT on the client!!!!!!! and nearly hung up. My wife was right next to and she was absolutely gobsmacked. I sat back and thought to myself “These fuckers don’t get it”. All that suffering for nothing!

Thanks for reading my rant….

BTW: I did finish the project, the client was amazed on how the app worked and it is has become an indispensable tool for their employees.

Finally!
I installed gitlab at our company. I ranted about not using any version control whatsoever in the past but now it happened!

My boss wanted to see a project I was working on for himself so I copied the project to a usb drive and gave it to him. I used git for the project locally and I told him to use this too if he changes anything. And that it would be a great idea to have this centralised on our server. He agreed and I told him he just had to give me the order to implement it. He was like "go ahead" and one hour later we had a gitlab up and running.
We will have some internal training to do and then we are in the 21st century!

I'm so happy right now.

Is Microsoft going to ruin GitHub? NO!

Are we going to get amazing git integration in VSCode? ABSOLUTELY!

They're a 600 billion dollar company and they're one of the leading contributors to open source. They know the community they are handling and how fragile it is. This is just a developer trust move from them.

Stop pretending this is the end of GitHub, cause it isn't.

For our 4 programming tasks we had to use Git. Which i fully support, except whenever one of my group members made a change she would commit min 8 times and the message would be "change". Even after mentioning to her that she should write What she changd she just changed it to: "change filename". I mean yeah, i can clearly see which file you changed but come on, WHAT in the file did you change. While doing this she also managed to overwrite my changes or completly delete my files forcing me to constantly restore shit 😐

A few years back, there was a super repetitive task I needed to do to create a bunch of new screens for a new feature.

The task was so repetitive that I just couldn't bring myself to do it, and was avoiding it as long as possible.

Finally the day came where I needed to get it done. I sat at the computer readying myself to finally start/finish the task.

As I was going through the files, I could see all the work had already been done..? Confused, I opened up git history, and saw that I had checked the files in a few nights back.

Best I could do was trace it back to a house party where I was the last to go to sleep.

That was the day that I realised the power of auto-pilot :)

The Linux Kernel, not just because of the end product. I find it's organizational structure and size (both in code and contributors) inspirational.

Firefox. Even if you don't use it as your main browser, the sheer amount of work Mozilla has contributed to the world is amazing.

OpenTTD. I liked the original game, and 25 years after release some devs are still actively maintaining an open source clone with support for mods.

Git. Without it, it would not just be harder working on your own source code, it would also be harder to try out other people's projects.

FZF is possibly my favorite command line tool.

Kitty has recently become my favorite terminal.

My favorite thing open source has brought forth though is a certain mindset, which in the last decade can be felt most heavily in the fact that:

1. Scientific papers with accompanying GitHub urls, especially when it comes to AI. Cutting edge research is one git clone away.

2. There are so many open hardware projects. From raspberry pi to 3d printers to laser cutters, being a "maker" suddenly became a mainstream hobby.

Why the fuck did I set up GitHub and all the deploy scripts if your just going to fucking ignore it and edit directly on the server?!?
"Oh, I ran out of time"
DO YOU EVEN KNOW HOW SIMPLE GIT IS?!?!?
"git add file
git commit -m 'Queef farm'"
AND YOU'RE DONE!

friend: so how are we gonna do this project together? download, edit then upload to google drive again. thats the fastest way.

me: how about git?

friend: what?

me: ill just create a repository and create branches before we merge it with master. no need to go through that process of downloading and uploading multiple times

friend: not sure... what... that.. is.....

me: oh we have a looooong way to go, ill guess ill have to teach u git right from the beginning

*my first day on the job to work on a website used by dozens of companies worldwide and 1000s of users*

me: So where can I find the git repository?
dev: Git?
me: Uh... what kind of source control do you use?
dev: We don't use anything fancy like that.
me: *freaking out a little, I already committed to this job*
me: So then where do you edit your code and how do you back it up?
dev: Oh, I just edit it on FTP and zip all the code every week.

I'm not angry, mostly sad.

At my workplace we don't use git.
There are constant overwriting, sending code via email or USB stick and forgetting passwords to zip-files shenanigans going on.

I already use git for all my local projects (literally git init in the directory) but my coworker and I thought that it would be a great idea to have a local server with a Gitlab running on it.
So I started looking into running a self-hosted Gitlab (for about 15 minutes) and then our boss who was sitting right next to me almost shouted at us: "Such stuff should be coordinated with the boss! We don't just do something and burn my money because it's _cool_!"

No, git is not cool, it's necessary for crying out loud! Gitlab is cool but at the end of the day also just another tool too.

I guess I have some persuasion to do.

I don't know what version control has done to our boss that he has such a deep dislike for it.

Often saying fuck it when I've got a project and I kind of really need to use git but I'm not good with it so I just go back to good old scp again 😅

My git merges are like my social life.

Lots of conflicts and it just doesn't go well

The importance of version control. Had a school project at a real company and i didn't understand it so i said fuck it. Then someone asked me to alter the js library a little and push/pull that to the server. I thought fuck it, altered it and accidentally pressed save (automatic ftp upload). Suddenly the file was overwritten (that guy worked on it for 6 fucking hours) and it went from like a thousand lines to just a few. We did restore it from the browser. He said: either you're going to use git or you're out.

Then i started using git.

There is no reason for any developer to not know git well. No fucking reason. Stop making shit harder for everyone by being like “oh I’m not the keenest on git” STFU and just learn it better you pussy.

1. Just because it sounds cool doesn't mean it is.
2. Automate all the things. If you can see everything from cli all the better.
3. If it isn't commited and pushed, it doesn't exist or won't after a hard drive burnout
4. Everything on your workstation should be quickly reproduceable or in a git repo.
5. Murphy is a bitch

Still not learning git properly. I still find it very hard to grasp how this works and although I'm starting to use it more and more, I just can't wrap my hear around it so I often reside to scp for upload and no version control at all.

:'(

Product Owner: "need this doing in 6 months, can you do?"
Me: "we're too busy to start another project at the moment - can you wait about 6 months for it to start, or I'll have to hire more devs"
PO: "I'll just outsource it"

36 months later the company he outsourced to is out of business and hasn't delivered, and I've had their half-finished shit show git repo dumped on me.
No comments, no docs, and no units tests, so no fucking idea what it's supposed to do

introducing my classmates to git and how it can help us.

*explaining scm, git, github and bitbucket, and conflict resolving*

"why don't we just use google drive ?"

3 fucking years already that I introduced fucking git in this company and people still fail to grasp the fucking basics... Wtf?

If you push a fucking change wait for the fucking message ... If a fucking fail message appears telling you to pull before pushing to remote, just don't ignore it... Wtf... I can tell it is the case just by looking at the message template, I don't even need to read the motherfucker...

And its not that they are stupid, those are smart motherfuckers we are talking about...

> git commit -m 'fixing what I broke earlier'
> git pish
> git: 'pish' is not a git command. See 'git --help'.

Did you mean this?
push
> you know I meant push, why can't you leave me alone and just do it

Just released the side project that made me join programming! :) It's been about five months and I learned a lot: PHP, JavaScript, CSS, Handlebars, Jquery, Git (terminal), I even started building a RestAPI. Its been an amazing journey, and I didn't alone! I met other Devs (now good friends) over the Internet and we did it together :) Thanks to everyone on DevRant for being such a great community!
If you want to take a look at the site is: projectgroupie.com
It's a website to find new projects you like and join them! So if you're a developer and you wanna make a blog, you post your project on PG asking for some designer to help you and if someone like it, he can join! :)

I hope you enjoy it and any feedback is welcome!

I just started using git. it is unbelievably useful. What an idiot I was that I didn't start using it earlier. I LOVE GIT!

A colleague from university cried the last week that he cannot use git. For him it was just a big pile of software BS. I didn't bother to ask, as he is a very whiney person and complains about everything.

I asked him today...

He tried to create a git repostitory on his usbdrive. How else could he work on different machines???🤔😝

I tried to introduced him to Github/Bitbucket/...
He knew about them but was afraid they would sell/use his bugriddeld programming excercises😂

Every time I mess up my git branch I usually find that its pretty futile to fix it with fancy commands like 'git reset', 'git prune', 'git rebase', etc. I usually find it easier to just start over from scratch.

They should really add a command for that

'git fuck-it-start-over'

TFW your client's git policies are so draconian that the dev teams use "develop" as trunk, and completely ignore the release process.

I wrote up 50 pages of git standards, documentation and procedure for a client. Bad indian director 9000 decides the admin (also Indian) who specializes in Clearcase and has no git or development experience is more qualified to decide and let's him set the policy.

FF to today:

- documentation, mostly contradictory, is copy pasted from the atlassian wiki
- source tree is the standard
- no force pushing of any branches, including work branches
- no ff-merge
- no rebasing allowed
- no ssh, because he couldn't figure it out...errr it's "insecure"
- all repos have random abbreviated names that are unintelligible
- gitflow, but with pull requests and no trust
- only project managers can delete a branch
- long lived feature branches
- only projects managers can conduct code reviews
- hotfixes must be based off develop
- hotfixes must go in the normal release cycle
- releases involve creating a ticket to have an admin create a release branch from your branch, creating a second ticket to stage the PR, a third ticket to review the PR (because only admins can approve release PRs), and a fourth ticket to merge it in
- rollbacks require director signoff
- at the end of each project the repo must be handed to the admin on a burned CD for "archiving"

And so no one actually uses the official release process, and just does releases out of dev. If you're wondering if IBM sucks, the answer is more than you can possibly imagine.

I just saw

`git add . --all&&git commit -m update&&git push`

as a npm script hook m) I don't even care, just surprised it wasn't named yolo.

Just scored my personal red flag bingo in new project:
- engineers who work there for 20+ years
- their own in house build tool
- "we have Jira so it means we are agile"
- "we have Jenkins so it means we do Ci/cd"
- git adoption is "in progress"

Almost a year since I started my current job and every day I struggle to make things better, from introducing git to introducing a testing server to moving to git lab to introducing backup policies on the servers and so on....

And the more I struggle to improve everyone's experience at work it looks like im trying to explain physics to toddlers because I can see that although everything is waaaay better now everything is just gonna crumble once I'm gone.

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

Tech support: we need to install backup software on your laptops.
Devs: what for?
TS: to backup all your important files, like word docs, excels, etc.
Devs: we don't use those. everything is on git/confluence/etc
TS: my boss told me to install it everywhere, so I have to do it.
Devs: well just disable it. uses too much tam, disk time and such
TS: whatever.

So he installed it on each laptop separately, took half a day, then we just disabled it and proceeded with our tasks. Now we get a question every other week why nothing is being synced from our computers. "We paid for the system and we want you to use it".
yeah..

One day Linus Torvalds will make a statement about git like: "Why is everybody using this? It was just a joke!"

What an absolute fucking disaster of a day. Strap in, folks; it's time for a bumpy ride!

I got a whole hour of work done today. The first hour of my morning because I went to work a bit early. Then people started complaining about Jenkins jobs failing on that one Jenkins server our team has been wanting to decom for two years but management won't let us force people to move to new servers. It's a single server with over four thousand projects, some of which run massive data processing jobs that last DAYS. The server was originally set up by people who have since quit, of course, and left it behind for my team to adopt with zero documentation.

Anyway, the 500GB disk is 100% full. The memory (all 64GB of it) is fully consumed by stuck jobs. We can't track down large old files to delete because du chokes on the workspace folder with thousands of subfolders with no Ram to spare. We decide to basically take a hacksaw to it, deleting the workspace for every job not currently in progress. This of course fucked up some really poorly-designed pipelines that relied on workspaces persisting between jobs, so we had to deal with complaints about that as well.

So we get the Jenkins server up and running again just in time for AWS to have a major incident affecting EC2 instance provisioning in our primary region. People keep bugging me to fix it, I keep telling them that it's Amazon's problem to solve, they wait a few minutes and ask me to fix it again. Emails flying back and forth until that was done.

Lunch time already. But the fun isn't over yet!

I get back to my desk to find out that new hires or people who got new Mac laptops recently can't even install our toolchain, because management has started handing out M1 Macs without telling us and all our tools are compiled solely for x86_64. That took some troubleshooting to even figure out what the problem was because the only error people got from homebrew was that the formula was empty when it clearly wasn't.

After figuring out that problem (but not fully solving it yet), one team starts complaining to us about a Github problem because we manage the github org. Except it's not a github problem and I already knew this because they are a Problem Team that uses some technical authoring software with Git integration but they only have even the barest understanding of what Git actually does. Turns out it's a Git problem. An update for Git was pushed out recently that patches a big bad vulnerability and the way it was patched causes problems because they're using Git wrong (multiple users accessing the same local repo on a samba share). It's a huge vulnerability so my entire conversation with them went sort of like:

"Please don't."
"We have to."
"Fine, here's a workaround, this will allow arbitrary code execution by anyone with physical or virtual access to this computer that you have sitting in an unlocked office somewhere."
"How do I run a Git command I don't use Git."

So that dealt with, I start taking a look at our toolchain, trying to figure out if I can easily just cross-compile it to arm64 for the M1 macbooks or if it will be a more involved fix. And I find all kinds of horrendous shit left behind by the people who wrote the tools that, naturally, they left for us to adopt when they quit over a year ago. I'm talking entire functions in a tool used by hundreds of people that were put in as a joke, poorly documented functions I am still trying to puzzle out, and exactly zero comments in the code and abbreviated function names like "gars", "snh", and "jgajawwawstai".

While I'm looking into that, the person from our team who is responsible for incident communication finally gets the AWS EC2 provisioning issue reported to IT Operations, who sent out an alert to affected users that should have gone out hours earlier.

Meanwhile, according to the health dashboard in AWS, the issue had already been resolved three hours before the communication went out and the ticket remains open at this moment, as far as I know.

Fuck you stupid cunt!!!! If your fucking project depends on empty folder structure just put a fucking gitignore file on it so I don't have to waste all fucking day debugging your tasteless spaghetti to figure out that you download files to an empty folder that git clone doesn't create.

Commit Message Part2:
6528fff Code was clean until manager requested to fuck it up
241b35f Who knows WTF?!
4381a32 Argh! About to give up :(
c3bf1a9 more debug... who overwrote!
2d68d6d Fixed a bug cause Maciej said to
b112c1a This branch is so dirty, even your mom can't clean it.
bb456d4 Shit code!
4878b46 Copy-paste to fix previous copy-paste
e2c7e87 A fix I believe, not like I tested or anything
f56109f derpherp
e4b8f4c formatted all
3691208 I'm just a grunt. Don't blame me for this awful PoS.
0888b69 just checking if git is working properly...
62741aa I'm too old for this shit!
0735196 COMMIT ALL THE FILES!
09caccf I CAN HAZ PYTHON, I CAN HAZ INDENTS
1e1cda8 giggle.
ab70bde Fixed errors
934436d Now added delete for real
5f84e30 My bad
99baff8 CHRIS, WE WENT OVER THIS. C++ IO SUCKS.
953473d final commit.
f0c3b57 Just committing so I can go home
4e5ce4e yolo push
deb4e3b I CAN HAZ PYTHON, I CAN HAZ INDENTS
710c06a Commit committed....
3c45e67 it is hump day _^_
4487788 Committing in accordance with the prophecy.
bf86e7e This solves it.
4804f68 FONDLED THE CODE
051d42e REALLY FUCKING FIXED

Is it just me or does it look like I accidentally spelled “derp” in git contributions?

!rant
Just managed to set up a laravel development server in my raspberry, with a fully functioning private git repo!

(Not having a CS degree nor working in IT... I am very happy with this!)

Developer confession.

I always git push a new branch even though I know it will error as there's no upstream, just to copy the full git push with set upstream arguments from the error message.

Current work project is microservices architecture out of 4 - 8 components.

It is fully Infrastructure as a Code automatized. I just change somewhere code, git pushing

And it automatically invokes Gitlab CI, terraform, ansible, kubernetes helm charts.
Auto checking itself with unit and integration tests in autoredeployed staging env. Then it saves tested results to docker registry and asks for one button verificating click to be rereleased to prod.

I just go for drink or eat food. While all the stuff is happening.

And I am proud that all the infrastructure, backend and frontend I made on my own.

I don't need to remember how to Deploy it. It is all automatized

-> everyone at the company uses git
-> asked to change some stuff
-> boss says "don't remove the old code, just comment it in case we need it in the future"
-> ...
-> ???

Assigned to a new project team..

Using git, in a creative way. So.. "master" is "dev" branch, usually. Everyone can push their branch to dev server .. so it's "dynamic for us". Production branch is whatever, as long as the branch has the release version. Sometimes, the release comes from "master".. that mean "dev" in normal geek..

That's just Git. The source code is a saturated spagetti of Entity framework and Caliburn. It is littered with antipatterns, especially basebean. Holy Christmas and Easter that baseclass do a lot of stuff that has no place as a base class ..

Fucking frameworks, I'm gonna start to evangelize frameworks as the no1 antipattern.

MS SQL as the main DB, but is dumped to json FILES through a scheduled task to increase read performance on web.

There is a soap endpoint to expose the json files, fml..

I am assuming I was placed here to improve stuff, I have never in my life seen anything like this before.

There is a special place in hell for this repository

Dev: Hay dude , look this page is broken, how long has it been like this.
Me: No? 🤔, Weren't you working on the Database for this yesterday?
Dev: I didn't change anything yet...
Me: Okay, let's do a git bisect and see where this came from.
...After going back in history and checking out like 3 commits.
Dev: It's fine I'll just search for it
Me: 😕, that's what we are doing the bisect for?
Dev: But we've already looked at so many!?
...After some time of convincing, finds good commit, does the bisect and finds offending piece of code. The database details changed.
Me: okay so while it's still pointing to the old database it's working but switch it to the latest one and it breaks. You sure you didn't change anything?
Dev: I didn't do anything.
Me: okay well it seems to me like it must be a database issue, let me know what you find.
10min later...
Dev: Hay dude, soo I found it, I accidentally renamed a table
In my mind: 😲😲😲

I hate working at a company with bad practices like saving database config into git and not making a copy of the database when you intend to work on it, and not edit the f'ing live instance! Not even close to the luxury of migrations.

I have just started out on Linux (Ubuntu because I don't know anything (please don't judge me (you're not judging me right?))) and I don't know anything aside from Linux relies on Terminal a lot. The tools are already installed (VSCode, git, etc.) and everything dark-themed. Is there anything I should have in your opinion, and where should I start?

!rant
I've just lost my grandfather last Friday from liver and gallbladder failure. Him being a composer and a musician impacted me a lot as a pianist try-hard. I regret I prioritized my studying for college over him and only visited him twice. But he saw my performance from my parents (they recorded it) and he complimented it, so it's more than enough for me. Rest in peace gramp, and thank you.

these are the kinds of commits i have to deal with :|
like "it's already past 5 o'clock! i have to leave!"

Cs Student. We currently have a course on algorithms, where we have to implement something in Java, test it with some sample inputs and in the end submit it to an online judge, so far so good. So why a rant? Well there's this one person, who strugles with programing and asks me a lot of questions. Usually I tell her, could you send me your code, so I can have a look at what doesn't work/where you made a typo/what ever. My thoughts: let's just copy it my IDE, take a look at the error message, and that should do it.

Guess how I got the code: As a few photos, taken by her mobile phone (as the code doesn't fit on one screen...)! Just send me the fucking file, or post it to gist.github.com or pastie.org or what ever fucking code sharing tool you want! Make a fucking git repo, I'll even live with SVN or just a .txt file by mail. But for the love of Linus Torvalds, stop sending me crapy pictures of your crappy code! For fucks sake!

I had just started as an SDE intern, and was fiddling around with the code base.

Me: Hey, can you send me the link to our version control system?
Mentor: Umm, what!?
Me: You know, where we keep our code backup...
Mentor: Hmm, is there a need for that?
Me: Yeah, I mean, my past experience tells me to always backup code, just in case something goes wrong.
Mentor: Ohh, that's easy. I'll teach you how I do it.

So, he comes to my workplace, and does this:
1. Go to your workspace folder.
2. Right click it.
3. Zip it.
4. Open outlook.
5. Compose email.
6. Attach the zip file.
7. Mail to yourself.
8. That's how it's done!

I was like what the hell!?!?! Is this really happening?? And then he started basking in his glory, as if he had taught me some secret hack! Seeing this, I couldn't even get myself to introduce him to git. That was the worst part.

My progression of learning git rebase:

Year 1: WTF just happened?! Where is my code?! *deletes and re-clones repo*

Year 2: Ok if I do it suuuper carefully I can get the other dev's one-line change into my branch...shit...shit...wait...fuck...oh lol it worked.

Year 3: Oh yeah let me organize my commits real quick. *drop pick pick squash reword pick fixup drop pick* *git push -f* 😎

GIT LOG VERSION 101
----------------
75fed18 pay no attention to the man behind the curtain
56772ff added security.
6374fdd needs more cow bell
6b27de9 Committing fixes in the dark, seriously, who killed my power!?
bffce8a giggle.
7e93977 Refactored configuration.
e66c495 pgsql is more strict, increase the hackiness up to 11
5690dd9 Revert "just testing, remember to revert"
daa84ba Still can't get this right...
097f164 this should fix it
367f271 GIT :/
f46d735 bump to 0.0.3-dev:wq
b893721 ¯\_(ツ)_/¯
24be0d9 ...
f014a0c ALL SORTS OF THINGS
e648b80 added super-widget 2.0.
3a71628 perfect...
e2a8cb1 Fucking templates.
b08e489 pgsql is more strict, increase the hackiness up to 11

My boss just asked me to participate in a conference call to help an external senior dev implement some stuff/tool into our website.
My boss suspects that he doesn't even know Git...
Let's see how that whole thing will turn out.
My boss told me that he looked at his code and it already looks like an abomination of PHP...
It is enough that my boss usually writes shitty spaghetty code.

I will not sleep well this night.

It is time. I have to admit it.

I don't understand Git.

I just memorized some basic commands: git commit, git push, git push -u origin master, git clone, git checkout [-B], git merge. That's it, that's the full list. I use them like they're some kind of magic spells that do what I need. Everything else, those intricacies like rebasing, resetting, HEAD and all that shit, is beyond me.

I'm not a real programmer. Real programmers know Git.

The year is 2019.

C++ is still one of the most powerful programming languages around..............with no centralized package manager that is widely adopted by the community that allows one to sandbox libraries from conflicts with one another.

I ain't hating, just find this funny and I love cpp

Apt get/git submodules it is!!

What the flying git did I just do.

So here I am, finishing my billionth.. ok maybe not that many, feels like it some days.. task so I do the following:

git add /path/to/file.ext
git commit -m "yay done for the day" /path/to/file.ext

- yes I specify the files in a commit, I've had bad days in the past, plus I can work on multiple files at a time -
But anyway...

Then all of a sudden 20 other files are now staged for commit 🧐🤪🤭😱🤯

Wtf!

Guess I'll be sorting this mess out before doing a push tomorrow morning.

The project tech lead asks me to add some Docker configuration files sent by the client to a project. He gives me a zip file and I unzip it and add the files to Git. Job done.
Later he checks the commit and starts bitching because I unzipped the file and it should have been added as a zip. After much debate trying to explain to him that Docker wouldn't open the zip file to search for the Dockerfile he just says "Can you just do it? I double checked with the client!". I give up after giving him all the arguments why he is wrong and do it.
The next day the client checks the commit and comments bitching that I included the zip file and not the contents of it.

I just got e-mail:

"Sunsetting Mercurial support in Bitbucket

After much consideration, we've decided to remove Mercurial support bla bla bla crocodile tears bla bla..."

So basically, Bitbucket started out as a Mercurial repository hosting platform. After GitHub's rise in popularity, they decided "hey, everyone's welcome, both Hg and Git!" Then it became Git and "okay Hg too, but shhh don't tell anyone". Now they FINALLY completed running it into the ground: "Only 1% of repositories are Mercurial" - yeah no shit sherlock, after actively hiding the fact you support it, people don't find out you support it! Surprised Pikachu! Oh congrats, Atlassian. You're so smart.

Mercurial support was the sole reason I had repositories there. I mean, for Git we already have GitHub, GitLab and others. So what's their unique selling point again? What's that, the sound of crickets? Thought so.

So after that, hopefully they change the name to "Gitbucket". Or preferably "Bitfuckit".

Me: How can I delete pushed commits from origin?
Colleague: Just do git reset --hard and then git push -f
Me: But this is dangerous
Colleague: Wait, I'll do it myself
Colleague: Done
Me: But nothing happened
Colleague: Fuck. I just removed all changes on my own branch

Had nothing to do today, so I thought I´ll test the migration of SVN to Git in Gitlab.

Boss sent me a mail today, that when I migrate we need to preserve the history, so I actually have to put some effort in it. *sigh*

Shout-out to the Gitlab documentation at this point.
That´s probably the best doc I´v ever read...

Well so I tried to use svn2git. And well...
Who the fuck thought that this piece of shit software is in any way usable?
Holy crap!
If it fails, it just does so without any info why. Even in verbose mode.
And the RAM usage? What the actual fuck?
This whole thing is a complete memory leak!
32Gigs of RAM full in Minutes and the whole system starts to stall!
And then when I thought it finally runs through.
Bam another git checkout error...

Googling for that error then I found something. A version of svn2git made in .Net Core.
Didn´t expect much but I tried it anyways.
And would you look at that!
It ran so smooth and didn´t need that much RAM , I had some doubt it did work correctly.
But it did!

I think I´m gonna pay a coffee or two to some guy over in China now!

To not waste time, let's just commit my work and put the message as ".....". Oh, and let's do that dozens of times.

---

One day we had to git bisect his work and found that. Then, obviously, we asked him "what the commit with five dots do?" he said that there was a a lot of them, and i proceeded to explain why it was a bad idea to not write a proper commit message.

He is a good dev, so he understood and started to write what the commit does, instead of five dots.

Introduced git in work about 5 months ago, explained to my coworkers how it works, shared links to tutorials, git pro book and everything imaginable.

Almost every day I learn something new ... they keep struggling to checkout a branch or resolve some simple conflict...

I'm just tired of explaining things...

Now I just go and fix every thing and learn a lot :)

TL;DR : do we need a read-only git proxy

Guys, I just thought about something and this potential gitpocalypse.

There is no doubt anymore that regardless of Microsoft's decisions about Github, some projects will or already have migrated to the competition.

I'm thinking : some projects use the git link to fetch the code. If a dependency gets migrated, it won't be updated anymore, or worse, if the previous repo gets deleted, it can break the project.

Hence my idea : create some repository facade to any public git repository (regardless of their actual location).
Instead of using github.com/any/thing.git, we could use opensourcegit.com/any/thing.git. (fake url for the sake of the example).
It would redirect to the right repository (for public read only), and the owner could change the location of the actual repository in case of a migration.

What do you think ? If I get enough ++'s, I'll create a git repo about this.

Ok so I was talking to my computer science teacher earlier and he said that he would rather use vim over PHPStorm for creating a laravel project. WTF!

Normally I would be cool with it, but he has pushed faulty code to git over 8 times. I'm just done.

So this just happened. I was working on a project and I just found a weird directory named '~' in there. I am on Linux so I simply did an "rm -rf ~" :/

It was too late when I realized it deleted all my files in my home directory. All my projects and configuration files. The sad part was it did not delete that shitty random directory because permission denied. Thank God I got into the habit of making weekly backups of my system and Thank God I use git.

2010: haha yeah I use StackOverflow too
2011: SO, amirite?
2012: omg SO servers are down
2013: am engineer and I use SO to remember how to eat and breathe
2014: guys, what if SO was down. CODEPOCALYPSE!
2015: I use SO and have imposter syndrome
2016: omg, git checkout this SO meme on /r/programmerhumor
2017: I'd rather skin my mother alive than have SO dowb
2018: Stack fucking Overflow... like.. what if... you... can't... use it... in an interview...
2019: check my twitter @paresh, tons of SO references with barely intelligible english

just fucking drop dead, pieces of shit...

boss: wish there was a way to go back to older versions..
me: there is, it's called git, I can show you how to use it!
boss: nah we will just keep using the sync on Dreamweaver
me:....the fuck?!

Our new hired (promoted intern) just installed Ubuntu on his new machine.
Now we are the only ones using Linux at work.

He was having trouble with a flickering bug on kernel 4.4.0 and I just told him to apt upgrade that it would solve it..
And he was like: oh.. Can you update the kernel?

That's gonna be a long month...hope he learns this faster than git

I was asked to look into a site I haven't actively developed since about 3-4 years. It should be a simple side-gig.
I was told this site has been actively developed by the person who came after me, and this person had a few other people help out as well.
The most daunting task in my head was to go through their changes and see why stuff is broken (I was told functionality had been removed, things were changed for the worse, etc etc).
I ssh into the machine and it works. For SOME reason I still have access, which is a good thing since there's literally nobody to ask for access at the moment.
I cd into the project, do a git remote get-url origin to see if they've changed the repo location. Doesn't work. There is no origin. It's "upstream" now. Ok, no biggie. git remote get-url upstream. Repo is still there. Good.
Just to check, see if there's anything untracked with git status. Nothing. Good.
What was the last thing that was worked on? git log --all --decorate --oneline --graph. Wait... Something about the commit message seems familiar. git log. .... This is *my* last commit message. The hell?
I open the repo in the browser, login with some credentials my browser had saved (again, good because I have no clue about the password). Repo hasn't gotten a commit since mine. That can't be right.
Check branches. Oh....Like a dozen new branches. Lots of commits with text that is really not helpful at all. Looks like they were trying to set up a pipeline and testing it out over and over again.
A lot of other changes including the deletion of a database config and schema changes. 0 tests. Doesn't seem like these changes were ever in production.
...
At least I don't have to rack my head trying to understand someone else's code but.... I might just have to throw everything that was done into the garbage. I'm not gonna be the one to push all these changes I don't know about to prod and see what breaks and what doesn't break
.
I feel bad for whoever worked on the codebase after me, because all their changes are now just a waste of time and space that will never be used.

A few years ago, a fellow programmer called me to teach him how to use git blame to find out who wrote that piece of code that broke the monetary ecosystem in this game. He was pretty upset about it because they blamed him about it. I gladly helped him just to see my own name there. Sad story.

I took this contract and made the suggestion that we backup to the cloud and create a private repo on GIT. Client said no, local should be fine, they don't want someone stealing their code. I said okay fine.
AC just went out in the server room and they apparently had a leak from the AC to the power supply which they happened to put on top of the rack servers and switches. I'm surprised that place didn't catch fire, might be to early to call it.
All this on a Friday and we were 2 weeks away from launch party.
Not my fault, I clearly said we backup to cloud and use GIT on private repo.

We're no strangers to code
You know the conventions and so do I
A full commit is what I'm thinking of
You wouldn't get this from any other dev

I just want to tell you about my problem
Gotta make you solve it for me

Never gonna git you up, never pull you down
Never gonna rant around and rebase you
Never gonna merge your branch, never gonna say $#@*!!
Never gonna risk a cry and build you

Been working with Git every day for the last 3 years and never had a problem with it.
Enters Windows.Stash changes, tries a simple stash apply:

error: cannot stat *file_name*: Permission denied

Please tell me you are fucking kidding me.. I did not just fucking lose all that work..

:q life

Boss is also a programmer which is nice. boss is also incredibly impatient. so when he gives me a project to do, when I don't have it done the day of, he goes and does it over the weekend. but he doesn't tell until a few days later when I finish the following Tuesday. he chucked my git branch and just pushed his stuff to master. then he belittled me because there was a feature missing in his code and I hadn't done it yet. I don't know how to deal with this. on the one hand, I could try and work faster. but on the other, I am trying to add features to software he wrote in c-style c++, didn't comment, and hasn't been updated to modern standards since 1998. even the copyright files are 1997 to 2001. just very discouraged as its my first job in the field. it wouldn't have been so frustrating if he had just told me he'd worked on it himself instead of letting me finish it and then throwing it in the trash.

end rant

!rant

Conversation between [C]oworker and... some kind of customer-side [P]roject manager.

P: Hey, our release 2.0 is ready, but somehow I can't add tag to master. Could you try, please?
C: Yeah, sure.... Done... We are missing tag for 1.2 still, should we add it?
P: Oh, right, I forgot about that.
C: Ok, found merge... Done.
P: *displaying repo in GitBlit* Uh, now the order is wrong. And date is the same. Can we do something about that?
Me: We can just push that tag with replaced date. *just guessing*
P&C: You can do that??
Me: Sure
Me.thinking: Thats git... I would be suprised if we could not.
Me: *pushing tag* Check it now.
P: Whoa, nice!

I practice what I call "Aggressive Oriented Programming" or AOP.

Whenever I'm investigating a bad bug, working on a project that I really hate, or dealing with messy code written by a messy developer, I often find myself resorting to an [internal] state of violence.

It's not like I scream and smash my screen (although sometimes I want to). It usually consists of a few git blames and some curse words in print statements for debugging. This is just my way to vent.

Godmotherfuckingshitpissballs fuck software development. Seriously wtf.

I learned c# and Unity for 4 fuckin years. Now I want to learn Electron and i just cant get it to fuckin work that motherfucker!

Installed node.js into a folder on my Desktop, git cloned the quick start app, copied the files, npm start and wow it starts.

ONCE.

It does not start anymore wtf? Also the stupid tutorials that I bought dont fuckin explain how to set it up properly wtf...

Doesnt help that im a windows noob and the guy in the tutorial is a macSnob.

Goddamnit I hate this phase of learning stuff. It fuckin sucks.

Also software development is around for like what? 30 years and electron is the best solution for GUI that people came up with? Fuck me.

Two things before this all:
- I fucking love gitlab so far
- I miss the fuzzy searching from sublime text, as vsCode still can't do it properly..

I was fed up with all the shitty overbloated git deployment scripts, sync scripts, automatic backup solutions and hosted git servers out there, so now my own solution is:

- remote git cloned local files
- local files are synced via dropbox, to easily edit them on any device
- all changes and deleted files are saved up to 1 year on dropbox
- remote has gitlab running and webhooks setup
- the webhooks point to my node scripts, which then rebase the code to its dedicated dev server
- daily server backup with 7 days roll
- cold storage backup each 30 days

Sounds like overkill, but from my experience, you really can't have enough places that have a backup, especially coldstorage backups.

My goal in general though is to have everything on my computer backupped and ready to go asap, if something happens.

I wanted to just use a virtual machine for development stuff, but that wouldnt be able to run on my laptop, so I need a more general solution, where I sync all configs and all projects across. (and have some sort of basic list of tools needed, so I dont need to remember them)

Found for example something for vscode to sync its settings and plugins via any sort of git, will give it a try in near future too.

I know this is SO original, but I like Linus Torvalds best. I love that he created Linux originally just as his own little project, and now..I'm sure you all know how big it is.

He also created git, basically because he was tired of the version control systems that were already out there. Just "oh this is shit, I'm gonna write my own", and if I remember correctly, within a few weeks he had the first functional version of git.

Plus the man says that he names all his projects after himself, I think that's pretty damn funny.

Don't you just love it when the lead developer/project manager comes in and totally revamps your code even though it does the same exact thing as it was written before? And then when it's not working he blames you because it's in GIT as your commit...

Setup git push notifications (to each of their own channels), together with automatic deployment via webhook, though I'll add notifications to that too, as it currently doesn't have any besides the log file.

Gitea really has been a blast for me to finally get all things git - done, maybe because it is just so lightweight.

From fresh experience, IF you are learning Git I would really suggest you fully learn it from a professional before really using it. So you don't accidently delete 1,5 weeks of work like I just did :))))))))))))

In just one week I have to make two presentations for my class, first one talk about open source and why everyone should use it and in the second one I have to explain how Git works and why it is so helpful for common projects.

It feels like God gave me an essential mission for life

The more i use git.. more the fun it is.. Just found out the usage of rebase and cherry-pick.. I have read about the implications of these commands in a shared repo.. But it is fun to use it in a solo repo..

Dumbass made me update site with broken code ...

After git pulling I got an ich and tested it...

So the following talk happened:

Me: feature x is still broken (it was working before...)

Dass: yeah, I just wanna make some screenshots of it from another machine that has windows.

Me: OK, I just rolled the changes back, you can access the other machine at lan...

Me inside: OOOHHHH YOU FUCKING PIECE OF SHIT MADE ME GET UP FROM BED AND START MY FUCKING COMPUTER FOR THIS BULLSHIT IDIOTIC NONSENSE?!? FOR REAL??? GET YOU SHIT TOGETHER ASSHOLE!

"Tar up your projects as version control."
- CS teacher

I understand git is hard (just the awkward syntax) and not part of a curriculum, but can it at least be suggested? A whole year later, I found out about git and it has made CS projects so much easier.

git commit -a -m "No more tape archiving"

If you just git add . by instinct, you're already dead inside

Instead, consider checking out the diffs of your changes before staging them, and then stage the files or directories individually

Of course I'm saying this to complain about my colleagues who stage and commit things they shouldn't, it probably doesn't apply to small side projects, but staging individually is probably a good habit to have

If git was written in english or in ancient greek it made no difference. It's everything counter-intuitive and you have just to learn commands by heart and google the errors. Because nothing makes sense, even if you know how it works and you used it for years

I think that two criterias are important:

- don't block my productivity
- author should have his userbase in mind

1) Some simple anti examples:

- Windows popping up a big fat blue screen screaming for updates. Like... Go suck some donkey balls you stupid shit that's totally irritating you arsehole.
- Graphical tools having no UI concept. E.g. Adobes PDF reader - which was minimalized in it's UI and it became just unbearable pain. When the concept is to castrate the user in it's abilities and call the concept intuitive, it's not a concept it's shit. Other examples are e.g. GEdit - which was severely massacred in Gnome 3 if I remember correctly (never touched Gnome ever again. I was really put off because their concept just alienated me)
- Having an UI concept but no consistency. Eg. looking at a lot of large web apps, especially Atlassian software.
Too many times I had e.g. a simple HTML form. In menu 1 you could use enter. In menu 2 Enter does not work. in another menu Enter works, but it doesn't submit the form it instead submits the whole page... Which can end in clusterfuck.
Yaaayyyy.
- Keyboard usage not possible at all.
It becomes a sad majority.... Pressing tab, not switching between form fields. Looking for keyboard shortcuts, not finding any. Yes, it's a graphical interface. But the charm of 16 bit interfaces (YES. I'm praising DOS interfaces) was that once you memorized the necessary keyboard strokes... You were faster than lightning. Ever seen e.g. a good pharmacist, receptionist or warehouse clerk... most of the software is completely based on short keyboard strokes, eg. for a receptionist at a doctor for the ICD code / pharmaceutical search et cetera.
- don't poop rainbows. I mean it.
I love colors. When they make sense. but when I use some software, e.g. netdata, I think an epilepsy warning would be fair. Too. Many. Neon. Colors. -.-

2) It should be obvious... But it's become a burden.

E.g. when asked for a release as there were some fixes... Don't point to the install from master script. Maybe you like it rolling release style - but don't enforce it please. It's hard to use SHA256 hash as a version number and shortening the hash might be a bad idea.

Don't start experiments. If it works - don't throw everything over board without good reasons. E.g. my previous example of GEdit: Turning a valuable text editor into a minimalistic unusable piece of crap and calling it a genius idea for the sake of simplicity... Nope. You murdered a successful product.
Gnome 3 felt like a complete experiment and judging from the last years of changes in the news it was an rather unsuccessful one... As they gave up quite a few of their ideas.

When doing design stuff or other big changes make it a community event or at least put a poll up on the github page. Even If it's an small user base, listen to them instead of just randomly fucking them over.
--
One of my favorite projects is a texteditor called Kate from KDE.

It has a ton of features, could even be seen as a small IDE. The reason I love it because one of the original authors still cares for his creation and ... It never failed me. I use Kate since over 20 years now I think... Oo

Another example is the git cli. It's simple and yet powerful. git add -i is e.g. a thing I really really really love. (memorize the keyboard shortcuts and you'll chunk up large commits faster than flash.

Curl. Yes. The (http) download tool. It's author still cares. It's another tool I use since 20 years. And it has given me a deep insight of how HTTP worked, new protocols and again. It never failed me. It is such a fucking versatile thing. TLS debugging / performance measurements / what the frigging fuck is going on here. Take curl. Find it out.

My worst enemies....

Git based clients. I just hate them. Mostly because they fill the niche of explaining things (good) but completely nuke the learning of git (very bad). You can do any git action without understanding what you do and even worse... They encourage bad workflows.
I've seen great devs completely fucking up git and crying because they had really no fucking clue what git actually does. The UI lead them on the worst and darkest path imaginable. :(

Atlassian products. On the one hand... They're not total shit. But the mass of bugs and the complete lack of interest of Atlassian towards their customers and the cloud movement.... Ouch. Just ouch.

I had to deal with a lot of completely borked up instances and could trace it back to a bug tracking entry / atlassian, 2 - 3 years old with the comment: vote for this, we'll work on a Bugfix. Go fuck yourself you pisswads.

Microsoft Office / Windows. Oh boy.
I could fill entire days of monologues.
It's bad, hmkay?

XEN.
This is not bad.
This is more like kill it before it lays eggs.
The deeper I got into XEN, the more I wanted to lay in a bathtub full of acid to scrub of the feelings of shame... How could anyone call this good?!?????

I just noticed visualizing git is like a timeline with alternate realities and a lot of time travel. The main branch is the main timeline and the branches are like fixes from the past to try and make the future better they merge when the future is fixed otherwise if someone or something fucked up time traveling it becomes the main timeline.

Just got an email from the boss asking if me and the other dev on a project have been liaising with each other before editing code because changes were being lost and over written.

Wouldn't it be great if here were some way to manage collaborations and control versions of files? *git*

The company is so reluctant to use git and do things properly.

-.-

Guess I'll fuckin try again tomorrow.

Building a cross platform c program. On Linux side, just using a makefile. Today I tried using visual studios "clone" feature for git. It just downloads the files and makes them available to the editor, it doesn't make a project, obviously.

But this has some disadvantages. For one, you can't build, or run. Two, you don't get any project properties. My project needs to set the character encoding to Unicode. Can't do that without a project.

So I use their tool to create a project from existing code. It didn't really work. The build profiles were janky at best and I still couldn't set the character encoding.

Ended up just deleting the whole thing.

Oh my motherfucking God...
How the fuck can a dumb IDE be so fucking slow? I entered the office at 8:15. And I am still unable to checkout a motherfucking previous version of an android app in git and get Android studio to build it, because the fucking gradle is so damn slow it freezes the GUI. WHAT. THE. FUCK. Android studio get you shit together and maybe, just maybe don't be such a dick!!!

You need 5 min to open that project and another 10 to build it ONLY FOR ME TO REALIZE THAT I HAVE TO REPEAT THAT WHOLE PROCEDURE BECAUSE I NEED A DIFFERENT APP VERSION FROM THE GIT REPO FUCK YOU YOU SHITFACED STUPID COCKSUCKING CUNT, SHIT FUCK ARRRRGH!!!

Sincerely,
Me.

Edit: now it's 9:35 btw

Just spent the *entire* afternoon trying to figure out why the hell my code runs fine locally, but doesn't when our CI server builds & deploys it on AWS.

...and I've now, finally, figured out it was all because I forgot to check a damn file into Git 🤦‍♂️

I'm simultaneously relieved, annoyed & embarassed.

Just a little poll for you guys :)

Do you comment your code during the development or when it's done?

Do you keep track of the documentation during the development or after?

Do you use Git only for source control or also to work from multiple places and keep the code up to date?

Do you sh*tcode on purpose (or don't make any effort to clean it) when it's not for yourself, or not for something you value much?

If you have any other strange habit, feel free to mention it :)

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.

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.

I was reluctant to try out flutter earlier on because of claims online stating that hybrid frameworks aren't there yet. That's one hell of a crap!
I fell in love with flutter after completing my first flutter app. Shit was just too easy. So many helpful libraries which has eased my overall workload lately.
We built a Native Android app which took 2months+ to complete and I just finished porting it to flutter for iOS and Android in 3 weeks. Boss was happy, Client was happy, I am freaking joyous, everybody is happy!

From the mouth of a Native Android Dev with over 5yr of exp. This shit called flutter is worthy of all the hype. I fucking kid you not!

I don't know about the past... I assume it was shitty then cus I also blasted it based on git issues but now it seems even more faster to build production worthy apps than anything I've encountered.

phpMyAdmin

Well, it is not my favorite open source project... I almost never have to use DBs, but when I do, it just saves my life. I can create the tables, keys without worring about any SQL command.

But day to day life is GNU/Linux, Firefox, bash/zsh, git... There are lots of opensource tools that I use, and love, everyday. :)

Well... I once accidentally deleted a classmates entire assignment. Basically we were working together on one and we had the code in Github, I had named the repo after the module code.
He was having some weird git issues and I thought it would be easier to just delete and re-clone on his machine. You can probably see where this is going.

Me: rm -rf <DIR NAME> Enter
Him: wait, which folder did you just delete

Turns out he had the repo cloned inside another directory with the EXACT SAME NAME, which also contained his previous assignment, the only copy of it in the entire universe (it was a group project and they did it all on his laptop with no source control, which i found hilarious).
It wasnt so bad since that assignment was already submitted and graded, but a bit of a fail on both our parts.

Well paid java dev. But the HW/SW-Stack is awful.

Monitor: single 1600x1024
5yr old notebook, old i5, magnetic hdd
Forced to use windows 7
No maven server
No CI server
SVN but no git
Eclipse, no intelliJ
No sonar server

There are days where I just can't take it anymore.

Someone else always have git log like this??
Or just me? 😂 ;-)

commit 6e71f545c3
Author: ShellAddicted
Date: Sat Sep 9 02undefined21 2017

it Works!!!

commit 6ac2c98bf
Author: ShellAddicted
Date: Sat Sep 9 01undefined47 2017

works more or less

commit 411b8e12
Author: ShellAddicted
Date: Sat Sep 9 00undefined00 2017

Initial state not working.

EDIT:
I just noticed that devrantron modified (bug) my rant (see the undefined in times)

The CTO has admin on the git repo and while we all have to have 2 other people review our pull requests. This guy will just go make a pr and merge it without review. It's not like its perfect code either. I will be going behind him and finding weird shit that he did days later and then go check the git blame. Yup its another one of his had to push it right now without review moments.

Every other day, Git is the best version control ever. Today, got damn it Git, why can't it just work

Just discovered Insomnia Designer, I freaking love it and it's git integration. This is exactly what we developers needed for years 🥳

We've got this legacy PHP system that doesn't really run anywhere else than on it's server. It's not configured with git, and there's no pipeline. Just plain old SSH. How would you go about managing it?

I hate it when (Java) programmers produce such clutter just because their OOP 101 professor told them to do so in 2005.
I refactored it using `git rm`.

!rant

git bisect is my new favorite git feature!
Just Google it! It's sooo awesome!

I was just commiting some code on GitHub for school tomorrow and I kinda got lost in the commit description..

Ah, it just hit me so hard I had the urge to get it out.. Helped, tho, love you Git

I met someone who worked at google. She gave me a lot of asvice and made me feel like i knew shit...

We were on a discussion and she made fun of me saying thats i livwd under a rock because i didnt know that youtube was owned by google.

And then she shut me down because i asked her about her opinion about Microsoft and git and told me she didnt know wjat git was.....

Im confused because i was okay not knowing something becausei see myself as learner. Yet she laughed at me. Which i can accept because its okay to laufh about people.

But she shut down the git discussion like a bitch “i don't know what it is and i dont want to speak a out it” in front of her friends.

While i would normaly take a dump on that person's front step， i am living in my partners city where everybody knows Each other.

Regardless， im a bit drunk and shes a ducktwit. I had a great night but ahe made me feel like shit coz she acts like she knows all this shit and im realising that she os just full of shit.

You see that got checkbox ‘initialize git’? Just ignore it for now, you’ll maybe want to learn about it later...

I was so mad at work today that I started singing to "Icona Pop - I love it" during lunch but altered the lyrics to match how I felt... Just sing along when your day is as bad as mine:

"I crashed my project into a wall, I watched, I let it burn" ... "I don't care, I love it"

"I threw this shit into a file and pushed it up to GIT" ... "I don't care, I love it"

"I got this feeling on the summer day when I'm gone" ... "I don't care, I love it"

I know that this will bring me many new enemy's but I'll just say it.

I like Mercurial more than Git.

Stop giving me pdfs, stop giving me word documents, stop giving me paper handouts. Just give me a README with the assignment on it that I can throw into a git repo where everything else I hand back to you is going to end up anyway.

It doesn't even have to be markdown'ed to death! I mean, that's a plus, and then you could, you know, have your example code's syntax lit up properly among other things. But a text file is all I really needed!

I started my actual gig as CTO of construction group (Innovation Hub) a year ago. And it was a hell of a ride, implementing kind of a scrum-ban for project management, XP, peer-reviews, a git-flow, git commit message formats, linters, unit testing, integration tests, etc...
And it's the fun part because with the CIO we had to drive the board to do A LOT of changes in their IT/Innovation drive.

But in one year there is a lot of KPI that went up :
* Deployment: When I arrived it took three stressful days to deploy a new version of one application, once a month. Today we do it every week, and it takes three annoying hours.
* We had no test. NOTHING! Today we have 85% code coverage for the unit test, and automatic integration tests run by our CI server every day.
* We had almost no documentation. Today our code is our documentation (it automatically extracted and versioned).
* We had 0 add value in the use of git. With commit messages as "dev", "asked task", inside jokes and a lot of "fix" and "changes". Today we have a useful git, and we even use it to create our deploy changelogs (and it's only mildly annoying!).
* More important, the team is happy! They get their purpose, see betterment in their tech mastery. They started doing conception, applicative architecture, presentations, having fun.

There is still a LOT of bad things we are still working on, and trying to solve (support workflow and betterment). But seeing what they already did, I'm so proud of my TEAM! I'm a fucking asshole, workaholic, "just do it" kind of guy. But they managed to achieve so much. Fucking PROUD!!

Hiring a third party to help us with something...
Third party: yeah okay, we know what we need. Can we get access to your git repo
Me: sure, I'll make sure you'll get it
(To the admins): hey can you get them access to our git server?
Admins: did they sign the personal data processing contract?
Me: oh they won't work with any personal data. It's a dev server and they only need access to the source code. And the usual contracts and NDAs are already done
Admins: well we still need the other one.

... Sure. Why not. Just delays the start of the process for... Like a week and a half until that useless bit of paper has passed through all the necessary departments. Not like time's an issue. Right?

I really don't mind it as long as the work is on track but damn it hurts to read the git commit messages with messed up spellings. In some cases it's not just that, but variable names, file names, etc. as well.

English isn't the first language in my country and a lot of people are not as proficient with it so it's probably not appropriate to judge, but the cringe is real.

Sometimes I wonder if I am that cringeworthy person to someone else.

Created Linux instalation flashdrive on my notebook like thousand times before. Simple dd if=img of=/dev/sdb . Tried installing system from it but somehow doesn't work. And the it hit me. I have both magmetic drive and SSD in my laptop! So insted of flashdrive, I have bootable beging of my SSD where my encrypted lvm used to be :-( Luckilly I lost just EFI, boot, swap, rootfs, few git repositories and ccache.

Lets discuss Git Clients. Now I love electron, in concept. And I love what you can do with it, on paper. And I understand Github's need to jack itself off by developing its own framework just to make its own software in being what Github is, and then everyone else following suite because Github must know best. And that's my rant, I don't think it had a point. So, favorite git client and why?

A rant from git,

Why do developers always PUSH and PULL me around. I mean they don't just do it once or twice. No they COMMIT to doing it over and over. I try to REBUILD myself, but it is hard getting pushed and pulled constantly. I don't know the ORIGIN of where it started, but gosh I wish the bullying never started!

My biggest problem with Visual Studio Code is that every fucking piece of shit dev thinks it's their duty to introduce it to me. STOP. Just stop this shit, alright? Wanna use vscode? Fine, just don't tell me it's the best tool and I MUST use it instead of the tools I'm used to. I'm tired of this bullshit.
Every new project, every new team. Starting from js/java/.net monke and ending with PMs, I must hear this bullshit about god blessed IDE that I must use, because "why you need intellij/webstorm/rider? just install vscode and some plugins. we all use it in our project and it's ok".
FUCK YOU! Refactoring is not just renaming variables and extracting blocks of code into functions. If you want terminal integrated into your text editor with highlighting and LSP support, so be it. I want an IDE with rich refactoring tools, code analysis and good completion, database viewing/modeling support, good build tools support, good UI for git and git-diff, good test and code coverage support. I don't want your semi-IDE, bloated with hundreds of bugged third-party plugins, which I must spend a week on to configure and merry with each other before using.
JUST STOP this crap and let people use the tools they are proficient/comfortable/productive with.

So.. I'm giving one of my employers webapps a visual refresher, new company branding and whatnot.

And then I stumbled onto a check that is not returning what anybody expects, and, well , I'm busy fixing things, yeah..? so I go digging.. 🤔

```
function isDefined(obj) {
return !(typeof obj === "undefined") || obj !== null;
}
```

Here's the fun part, these particular lines have been in the code base since before 2017, which is when my Git history starts, because that's when we migrated projects from Visual SourceSafe 6 over to Git. Yes, you read that right. They were still using VSS in 2017.

I've begged and pleaded with my last 3 bosses to let us thrown this piece of shit out our second story window and rewrite it properly. But no, we don't have time to rewrite, so we must fix what we have instead.

I lost 4 hours of my life earlier today, tracking down another error that has been silently swallowed by a handler with its "console.log" call commented out, only to find that it's always been like that, and it's an "expected error". 🤦

Please, just fucking kill me now... I just, I can't deal with this shit anymore.

I found a great app on iOS that allowed me to clone my Git repo, make commits, change branches, it had everything! I made a small commit and went to push to the remote server, but then it told me that I had to purchase premium to be able to push to remote. I was kind of upset, but I went to check the price of premium, in case it was a few cents. Nope, $25 just to be able to push commits. Seriously? If I was at my computer I’d be able to do this for free.

Ah good ol' refactoring summer.

*Me starts refactoring spaghetti bolognese*

- Hurrah everything can be generic and so much better. I'll just do this and this and this and this, oh and this also needs to be reworked cuz of this.

8 hours later.

- it wasn't that bad!

$ git status

- oh god

$ dotnet test

- welp.... I need something to do tomorrow.

My coworkers are always too busy to learn new things ... and the only thing they adopted is git... other than that its just a clusterfuck of spaghetti code that everybody develops the way they see fit...

at least we are using a local (because reasons) gitlab-ce that I managed to install on the shadows and kind of introduced it without disrupting their way of pulling pushing ...

and they didn't even log in there , only once.. to create the account 😐

why don't people have any passion to learn? :/

Just going through some old code from git repo's and code examples and I have a message to every dev out there after seeing some of the code quality...

Never... ever... ever fucking give variables with names like vx, tr and sq.

Give your variables names that explain what they are, it is so fucking hard trying to follow code that has 2 letter variable names and there is a special place in hell for you :-)

Just met a startup that has a programmer intern but no IT supervisor. I felt so sorry for her that I decided to show her a few cool tools that she can use in her work.

She was still using Xampp, Google Chrome, command prompt and paper trails (for all of the passwords she had to manage to different accounts)

Shown her how to use Docker, Git Bash and WSL, FireFox Developer Edition, VS Code (if she decides to not use that unregistered Sublime Text editor) and LastPass (personal preference).

Best of luck!

Am I the only developer in existence who's ever dealt with Git on Windows? What a colossal train wreck.

1. Authentication. Since there is no ssh key/git url support on Windows, you have to retype your git credentials Every Stinking Time you push. I thought Git Credential Manager was supposed to save your credentials? And this was impossible over SSH (see below). The previous developer had used an http git URL with his username and password baked in for authentication. I thought that was a horrific idea so I eventually figured out how to use a Bitbucket App password.

2. Permissions errors
In order to commit and push updates, I have to run Git for Windows as Administrator.

3. No SSH for easy git access
Here's where I confess that this is a Windows Server machine running as some form of production. Please don't slaughter me! I am not the server admin.
So, I convinced the server guy to find and install some sort of ssh service for Windows just for the off times we have to make a hot fix in production. (Don't ask, but more common than it should be.)
Sadly, this ssh access is totally useless as the git colors are all messed up, the line wrap length and window size are just weird (seems about 60 characters wide by 25 lines tall) and worse of all I can't commit/push in git via ssh because Permissions. Extremely aggravating.

4. Git on Windows hangs open and locks the index file
Finally, we manage to have Git for Windows hang quite frequently and lock the git index file, meaning that we can't do anything in git (commit, push, pull) without manually quitting these processes from task manager, then browsing to the directory and deleting the .git/index.lock file.

Putting this all together, here's the process for a pull on this production server:
Launch a VNC session to the server. Close multiple popups from different services. Ask Windows to please not "restart to install updates". Launch git for Windows. Run a git pull. If the commits to be pulled involve deleting files, the pull will fail with a permissions error. Realize you forgot to launch as Administrator. Depending on how many files were deleted in the last update, you may need to quit the application and force close the process rather than answer "n" for every "would you like to try again?" file. Relaunch Git as Administrator. Run Git pull. Finally everything works.

At this point, I'd be grateful for any tips, appreciate any sympathy, and understand any hatred. Windows Server is bad. Git on Windows is bad.

I think VS code is the only product from Microsoft which is not broken like I'm writing in it and it feels good. Extensions are great, integration with git is also really good and debuger isn't complete bullshit. I had Sublime before but I switched it to VS code just to try it and I'm keeping it.

I know it isn't lightweight like other editors but fuck it... VS code is great

What are you using to code?

It's hard to teach git to a beginner! There's just so many bits of info that you have to know before it clicks into place. Not to mention git's "reuse" of certain commands with files and refs.

We have pretty fast and lean dev process between QA/Design/Devs.

But sometimes, it's going to shit ;p

QA :
An option "ROLE" is missing for grouping in that table.
So 5 min to create ticket, assign someone from design on it

Design : Yeah, this is true. We missed that option in our design.
Proceds to modift figma by adding an option "Role" to a drop down.

Reasigned to Junior dev.

Junior dev : I have no clue how grouping works with graphql.

So at least 30 min.

Reasigned to me.

Me after 1 min of looking at it : PR chhanges on screen shot :

Facepalm... Everyhtibng was already in place, someone forgot to add id AND name, not just name.

Git blame => Or never mind... it was me..

Hi guys. I'm totaly new to git and github. I visit it from time to time but I never contributed.(i know, my description lied, a bit. i forgot to update it to say yesterday, a week ago etc.). I just created my first repo. I want to know where would be a good place to start to learn about it and know how to structure it and etc?

i hate ios storyboard
its a disaster
its not Version controllable, also its not as good as android xml layouts where you can just copy paste someone else xml to get a view exactly like his
right now I have to clone a git repo, to open it in xcode, just to see how the guy has set up one of his textFields so that I can create a textfield like his

Is it just me or "git blame" is just the best feature of git?

Our site ran into a cache stampede which took down the site for awhile. While people were helping out, I just stayed out of their way since I knew nothing about it -_-

I realise I need to git gud but I can't help feeling inadequate and useless at times like this.

Is perseverance, experience, and passion to keep learning and bettering oneself the only way to being a master?

Training a developer... After one year, he still doesn't understand "Update-Database"

Create a powershell command and just tell him to click on it after every git pull

I love git stash.

It's helps a lot for doing refactors to me. I guess it's not the most complex workflow, but it wasn't obvious to me when I started with git. Let me explain.

Refactors. As you start writing the first lines of a refactor, you start to notice something: you're changing too many things, your next commit is going to be huge.

That tends to be the very nature of refactors, they usually affect different parts of code.

So, there you are, with a shitload changes, and you figure "hey, I have a better idea, let me first do a smaller cohesive commit (let's call it subcommit) that changes a smaller specific thing, and then I'll continue with the upper parts of the refactor".

Good idea, but you have a shitload of changes nearly touching every file in your working copy, what do you do with these changes? You git stash them.

Let's say you stash and try to do that smaller "subcommit". What sometimes happens to me at this point is that I notice that I could do an even smaller change inside this current "subcommit". So I do the same thing, I git stash and I work on that even smaller thing.

At some point I end up `git stash pop`ing up all these levels. And it it shows that git stash is powerful for this.

* You never lose a single bit of work you did.
* Every commit is clean.
* After every commit you can run tests (automated or manual) to see shit is still working.
* If you don't like some changes that you had git stashed, you can just erase them with git reset --hard.
* If a change overlaps between a stash you're applying and the last "subcommit", then
if they differ, git shows conflicts on the files,
if they are identical, nothing happens.

with this workflow things just flow and you don't need to wipe out all your changes when doing simpler things,
and you don't need to go around creating new branches with temp commits (which results in bloated temp commits and the work of switching branches).

After you finish the refactor, you can decide to squash things with git rebase.

(Note: I don't use git stash pop, because it annoys the fuck out of me when I pop and you I get conflicts, I rather apply and drop)

Visual Studio Code !!
It has tons of features, form keybinding, to language support

I just love the inbuilt terminal support

And with git integration and some plugins, there's absolutely no need for separate git client

Wondering how many people use git cmd and how many use different git clients.

I regularly use git cmd. I made a transition from clients a while back because I wanted to learn more about how it actually works and it works just fine for me, except when I have to google something I don't remember (like how to revert local commit)

Git clients will for sure do abstraction which can be both good and bad, but I'm wondering if there are any definitive pros for clients.

I have been working with git for years now, and I could never work on a project (regardless if big or small) without it. Its great.
However, just a couple of days ago I learned about the git flow branching model.
Even tho I also worked with branching on a daily basis for years, I did not know about this model. And I have to admit: Its awesome.
If you don't know it, I highly recommend you to look it up. It really improves the already organized workflow with git even more. :)

Bitbucket full of dicks!!!

Dude just pushed merge conflict comments!!! At first he was like I did not do it, so I was like git blame bitch! Now he is like it wasn't my fault so what I used force push!

Well that was it I will leave this unholy company!

I waste 50 minutes reading tutorials and StackOverflow answers just to configure to my Git and GitHub account so that I can push the main local branch to the main remote branch from my terminal, and I still can't do it.

Fml.

When you git cherry-pick for the first time, screw up, rebase-drop, repeat, screw up again, and end up just pasting the correct versions of the files and commiting on top of the branch.

Dirty, but it works.

Is there any sense in using git for a personal project of which I'm the sole dev? Just as a way to learn version control and such, or is it nothing like what it would be as a larger team?

Just finished writing a Git Mini Handbook for beginners. Plan on releasing it on Amazon this week and then begin finalizing the Mega handbook.

I just find it better writing my knowledge into books other than sodding around a software project.

God damnit!!

Just got a team assigned for the course I follow and the codebase they work looks like someone shit on the floor and dragged it all over place. No consistency, no clear structure.

The project has to be built in PHP (which is fine by the way) following the principles of MVC. Did I say the codebase looks like shit all over the place? Well that's exactly what it is!!

They use $_SERVER['DOCUMENT_ROOT'] everywhere!! In every fucking file!! Why the FUCK would someone possibly want to do that??

I know I'm not perfect, but what the fuck!!

Now comes the most weird thing. They have to work on a remote server without SSH access, so working with FTP is mandatory. This is because the school won't setup ssh. That's fine by me, but because of that they don't use git!! They upload files directly to the production server. They merge everything manually. I asked why they didn't use git and the answer was so fucking SHIT!! "Because the teacher wants to see who uploaded to the server.."

First off all: what happened to git blame? Second: Later I heard that there is only one FTP account, so all the things they said where just bullshit!!

The fuck.

Tomorrow I'm going to try and convince them to use git..

We've got a big legacy app which we have to rewrite. The current client applications are only working on XP(!). We have to move the clients to the browser so we can finally get rid of all XP vm-s. The db schema is complex but still 1000+ stored procedures and functions and about a hundred tables with 13 years of data.
So I ask the guy responsible for maintaining the DB code. (he is ~25 years older than me)

me - Where is the source of the database. Which project?
he - Where would it be? It's in the db.
me - So we've got a huge db without VCS, upgrade/downgrade scripts, etc?
he - Yes. I don't get why young developers always want to use shiny new tech like git just because it is cool. It has nothing that an external usb backup drive can't do.
me - VCS has been around since the early 1980's...
he - If you really want, you can put it under git or whatever, so you can sleep better, but I still think it is stupid and a waste of time.

I get that it's hard to keep up, but getting personal...

I wrote a tech book several years ago for O'Reilly, which itself was a dream come true. I'm still amazed I got that deal done, and the fact that my name was on a title with a unique animal on the cover is SUPER cool.

Back then, their publishing system was based on Git with their own markup language, and it was sort of a chore to use. Easy and straightforward, but laborious. I spent 3 entire days just (re)formatting my drafts to their code. They've upgraded it since, I see, based on the same fundamental versioning idea and still using Git. Neat!

I've also done tech writing for .NET Magazine, which used Word's change tracking, and penned articles for other publications using Google Docs, or even drafts in WordPress.

Have all of you run into interesting systems used by publishers to manage content?

I might have just git-committed the cardinal developer sin: not multiplying estimates by 3. Torvalds help me!

So a php app I developed a few months ago when I was first starting as a dev needs an upgrade. Pretty simple since I've known about said upgrade for a while, but the feature was never needed until today.

Told my boss it would take a day or two of refactoring and additions for it to work.

How screwed am I?

let me preface with the fact that I'm now known at my new job for being the resident cli hipster. I can't lay any claims to knowing if it's "better" but I like it, I don't care if you do or don't, it just works for me and my flow

so at my job, we generally squash all our commits into one commit and delete the source branch upon merging; i accidentally committed all my work to an old, already merged branch, so my boss tells me it would be more of a PITA with the weird references we would encounter by merging the branch again, rather than just cherry pick the commits into a new branch, which i'm like "eh, fine.".

HIM: "You want to share your screen so we can resolve this?"
ME: "k"
HIM: "Oh, you won't be able to do this in a terminal, you are going to have to load up a GUI of some sort"
ME: "lawlz, no you don't"
HIM: "i highly doubt you will be able to accomplish that, but if you wanna make an ass of yourself, i'll humor you"
ME: "yeah, watch this"

> git log > log.txt
> git checkout <new branch>
> git cherry-pick <copy-paste-full-commit-hash-here>
> git push

ME: "done"
HIM: "what? there's no way you did it that easily, where are all your other commits???"
ME: "i usually try to amend my commits since we squash them anyhow. it really helps in situations like this"
HIM: "well, you go girl"

roll that up in your fancy degree and smoke it, why don't ya?

Background: Process issue in the plant that the workers said was a software problem. I’m a Software Dev Manager

Exec: This is broken and it is a software problem. We just noticed it this week.

Me: Couldn’t have been us, relevant code was changed this time last year. Sounds like a process issue.

Exec: Can you give me an exact date it was changed last year?

Me: (Seriously, WTF?... checks git...) It was changed on December 2nd, 2016. Couldn’t have been us.

Exec: Can you detail that change for us?

Me: (GTFO) No, not my problem, stop trying to make it my problem.

I'm down to write multi dimensional Git. I'm tired of losing the code that I wrote in my dream to go up in smoke every time when I woke up.
I just want to commit and push it to the dimension that I'm livin'. So that I'll have access to the code that I wrote in my dream.

Dev Confession:
I wrote a bunch of code today that created more problems than it solved. I did not commit it. I used git stash to hide it. It took me hours to write. I didn't do a test on a small section of code beforehand. Literally hours of wasted man hours.

At least I didn't commit this garbage into the repo. The approach was fine, but the architecture made it a non-solution. Now I need to redesign this code or leave as is. It is production code I cannot just "change" on a whim.

I have officially dubbed this week as confession week. This should be a world wide thing. People should fess up to their terrible deeds. Lets start a trend and confess to our misdeeds in code and life. Make the world a better place!

What do you say?

What do you guys think about mercurial (hg)?

I think it has no place in a world where git exists and I prefer git.

Just wondering what the general sentiment is

Me: Ok I've updated the docs, I'll open a PR with the changes

Maintainer: Looks great! Can you remove the changes to the package-lock.json? (I assume it got updated when you ran npm install to start the webserver)

Me: Ok sure, I'll update it soon

And this is where the troubles begin. The file was commited 2 commits ago, so I have to roll back to then. However, the remote repository has been updated since then, so I git fetch to keep up to date.

This makes the rollback a hell of a lot harder, so I run git log to see the history. I try a reset, but I went back to the wrong commit, and now a shit ton of files are out of sync.

I frantically google 'reset a git reset', and come across the reflog command. Running that fucks things up even worse, and now so much shit is out of sync that even git seems confused.

I try to fix the mess I've created, and so I git pull from my forked repo to get myself back to where I was. Git starts screaming at me about out of sync files, so I try to find a way to overwrite local changes from the origin.

And by this point, the only way to describe what the local repo looks like is a dumpster fire clusterfuck that was involved in a train wreck

I resolved the mess by just deleting the local copy and git cloning again from my fork.

I gotta learn how to use Git better

Just posted a comment, and I realise it should be a rant.

In reply to stalkCoder (i think):
| At first there was nothing
| $: git init
| And then there was light

A new creation myth appears.
$ git add --all
$ git commit -m "Update 32 at 2:48 AM"
$ git push
The new creation myth is destroyed by the pure rage of a thousand Git commit message standards.

Until today, I had assumed deploying stuff to prod would NOT be one of my responsabilities in this company. Apparently that's not the case.

Had to deploy my code and pray it didn't break anything. Why is this a big deal at all?

Well you see, there is no repository. At all. No git, no svn, not even duplicate folders. No tests, no pipeline. Just a bunch of CPanels.

Had to manually copy files and folders from the development site to the production site and partially copy a database. "Just drag and drop" were the instructions I was given.

As if using CakePHP2, PHP5 and having to parse fucking Excel files wasn't bad enough, now I have to deal with one of the worst ways to deploy code.

Fuck it, I'm switching on the looking-for-job flag on linkedin.

!rant (okay somewhat it *is* a rant, idk)

So I recently got into using react-native to make an android application, with another partner of mine.
I use a Mac while my partner uses Windows
Now since I was the one who suggested to use react-native, I started the project on my system, set it up (took some efforts though), and put the code on a git repo.
My partner cloned the repo, and it stopped working. Bummer.
The exact same code worked perfectly well on my system, but didn't work on his windows.
When he made a new project on his system, it didn't work on my system.
The error that kept occurring was EISDIR on both our systems.
Is react-native not meant to work for development on different platforms or is windows just a bitch as usual?

!rant

So this has probably been asked loads of times but I've never seen it. When working on solo projects for yourself do you still use source control like git or mercurial?

I usually don't because when I do personal projects its usually filthy and fast development to prototype quickly.

However, this current project I'm working on I am using git and I'm finding that slowing myself down just to follow good practice is actually improving my code quality and my understanding of my own project.

Probably joining my first real project. Truly no amount of university education can prepare you for the sheer scale and complexity of an enterprise software project. 100+ git repos, 5 different services running just to run the project locally, with tunnels open to 2 different DBs. It was daunting to touch anything.

git pull origin master --allow-unrelated-histories

Because I like to keep life interesting.

Me at my new job: Can I please install a version controlling system to keep my codes organized?

Boss: why do you need it? can't you just navigate the directories?

Me: I will go mad in 2 years!
....
Opens VS 2019 ... sees Local Git Repo system... mind blown!!! :O

First patch for buildroot submitted and added applied to master!! 😁

I had the impression that git (like, more than "git add ." was just too complicated and that making patches was some sort of dark magic using some obscure unix tools.

Well, it turns out that is actually pretty easy, fun and exhilarating!!

Looking forward to build up until I'm making contributions to the kernel! 🤓

Is it just me, or does it look like my git graph could give a good back rub?

You know that time when somebody had a problem with a system you wrote years ago, and it has taken you an hour to try to remember how to even call it, because the documentation and code didn't get migrated from svn to git, and the svn server has been shut down for some reason, and the admin is out today, and the last time you had the code was three machines ago, so you're trying to gleam what needs to be done to just call the stupid thing from log files set to 'error'?

That time is now.

I've already ranted about this, the hdd randomly broke over night. I was (i shit you not) just about to set up backups for it this day.

Being relatively new to linux but confident with bash and cli and stuff.. reading "I/O Error" as output of nearly any command on a server rented somewhere 150 km away from me was like a punch in the face.:D

It wasn't directly bad, but it was kinda sad, I had a (now don't laugh - a man gotta chill from time to time) minecraft server running there with tons of mods and we were multiple 100s of hours into it already..
But not only that, my projects weren't on any git or anything anymore (local copies were gone, guess what gitlab i set up proudly i used..) and there was no recovering these little loved ones, together with my website.

It was a black day, my group i had to work with in university doubted me because for them i wasn't able to manage a git server properly and i hope it does not happen again..):

Is it just me, or does anyone else find it extremely satisfying completing a successful git push -u origin master?