cd ~/repos/work-project27
git checkout dev
git branch new_feature
### code for a few hours, close laptop, go to sleep, next morning
git checkout dev
### code for a few more hours, close laptop go to sleep, next morning
## "oh fuck, I already implemented this in new_feature but differently"
git checkout dev
git diff new_feature
## "oh no. oh no no no. oh fuck. I can't merge any of this upstream and my history is borked."
git clone git@workhub:work/work-project work-project28
cd ~/repos/work-project28
Programmer Humor
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
Rules
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
Truly a Sisyphus tale
That last one is more common than I'd like, a lot more
Oh I used to do it as a kid
The last is just a normal git workflow, isn’t it?
At university there were some students that want to manage projekts in could storange. That was just stupid but i didn't know it better at that time.
I'm sick...that's my excuse....
Didn't want to be mean with the meme
Don't worry, it's fun
Why did you mention git twice?
While TFS did support Git, I had to deal with the much worse TFVC for a long while, up until Azure DevOps came along.
MyProject - Copy v2.bak new NEW (3)/
And when it’s release, then you rename it to
MyProject - Copy v2.bak new NEW (3) FINAL.2-19-24/
and then at the next standup, we all ponder how we can rename it to
MyProject - Copy v2.bak new NEW (3) FINAL.2/19/24/
because the team lead needs m/d/yy names with forward slashes
btrfs sub snap -r
With properly configured subvolumes, I'll allow it.
Isn't that just git with more steps and harder to share?
It's equivalent to cp -r
, but:
- the copy is read-only
- reuses unchanged files
- easier to share (
btrfs sub send
)
Sounds just like git (unless you do some special operations to change the copies)
Couldn't add perforce to the list because someone else was checking it out, I see.
CVS is gonna make a comeback! I tell ya!
I do miss the tags of SVN that would replace certain strings on each commit such as the date, a version number, etc.
cp $fic $fic.$(date -Iseconds)
git commit -a -m "save at $(date -Iseconds)"
# edit $fic
git commit -a -m "save at $(date -Iseconds)"
git push -f
No love for cvs?
The last one can easily describe Django. Feels like depending on the code base/your mistakes/people you work with can easily turn a normal project into a project where majority of the files is just migration files.
I knew a dude who would burn a cd every week and store it in his house as his version control, his software is still used by hundreds of businesses to this day
Perforce Helix, here I come!
cp index.php index.php-20250220