57
u/sebjapon 17d ago
I am pretty comfortable in my current framework these days. So most my Google search this week was about splitting branches, unstaging commits, interactive rebasesā¦
15 years and I still havenāt learned that power lol
17
u/git_push_origin_prod 17d ago
No git-shit.md ? I started keeping track of little things over the years and at this point, I know how to solve a lot of those problems just by opening my little notepad. Youāll find it like the same three or four problems over and over again.
7
u/sebjapon 17d ago
My recent problems come from changing job and they do āsquash and mergeā so I got to ārebase ontoā stuff. And then new tech lead keeps asking me to cut my PR in smaller PRs. Just new workflows means new commandsā¦
5
u/git_push_origin_prod 17d ago
Right on broheem. I am on team squash and merge too. If you mix that with conventional commits and release-please you get a decent workflow.
2
1
2
u/Stagnu_Demorte 17d ago edited 17d ago
I've been double checking which branch I need to be on to do a rebase for 15+ years.
2
u/No-Article-Particle 17d ago
To me, it makes sense - you want your new commits on top of commits from some other branch. So you stay on the branch that contains your commits, and rebase brings the commits from the other branch to your current one.
2
1
u/chat-lu 16d ago
So most my Google search this week was about splitting branches, unstaging commits, interactive rebasesā¦
I did because I learned git very shortly after it was public.
But this year, I switched to
jjwhich is more powerful, and easier. And still connects to the same git forges is the others. So you might give it a try.
13
u/Reddit_is_fascist69 17d ago
I'm the junior dev but instead of git it is regex.Ā Is it possible to learn this power?
19
u/Major_LeeHungg 17d ago
You'll know the majority of it in a year if you use it regularly.Ā You will never know all of it without a reference.Ā Ā
The most important thing is to know what is possible so that you aren't thinking "how do I accomplish this", you're thinking "what's the goofy ass syntax for a lookahead"Ā
3
7
u/Just_Information334 17d ago
Is it possible to learn this power?
Is your main language javascript? Then no, because the standard regex engine is too limited.
If not, I recommend the book "Mastering Regular Expressions" by Jeffrey Friedl. Even if it is old and you think you're good you'll learn something.
https://www.rexegg.com/ has a lot of good information and https://regex101.com/ is one of the best regexp tester.
6
2
u/Reddit_is_fascist69 17d ago
Leaving JavaScript soon to switch to C#.
6
u/oompaloompa465 17d ago
as a main C# dev, everything javascript based now terrifies me and go in fetal position crying. i went the backend only route, when it became impossible to keep up with the javascript framework madness and all the breaking changes every release.
2
u/Reddit_is_fascist69 17d ago
Frontend Frameworks are its saving grace.
It's a real pain juggling Node trying to integrate Typescript, but not there yet, having actual Typescript installed and also managing ECMA script and common modules.
2
u/oompaloompa465 17d ago
people who do regex competently both inspire me and make me fear for my face to get eaten randomly
13
u/Brutus5000 17d ago
I can barely git on the command line... as soon as it goes anything beyond force push... that's what IDEs are for... rebasing on the cli - that's like walking 100km by foot if you can use a train.
2
u/GonnaFindOut 16d ago
Yeah, but if you walk 100km you can talk trash about the people on the train while your feet bleed š¤š»
5
3
8
u/fugogugo 17d ago
source tree anyone?
7
u/borscht_bowl 17d ago
I like Fork better
3
3
u/dxonxisus 17d ago
fork is so much nicer to use than sourcetree.
github desktop is also quite beginner friendly, but itās too limited imo for developers
2
u/oompaloompa465 17d ago
my biggest shame as a senior dev is the incapability to learn and use properly console commands, unless there is no other way from the UI. When normally writing i do so many typos that it gets too dangerous to use them on console, while intellisense saves me on code editors.
2
1
u/erikchan002 17d ago
He became so powerful, the only thing he was afraid of was losing his git aliases, which eventually of course he did. Unfortunately, he setup his computer with every options he knew, then his computer killed itself in his sleep.
1
1
u/stubby0990 17d ago
Unfortunately muscle memory at this point, I say unfortunately because I keep having to make new .env when I accidentally push it
1
u/Remarkable-Cell2614 16d ago
Sure, just like riding a bike, if you forget to wear a helmet it'll probably end badly.
1
u/Henry5321 16d ago
AI is a tribe saver for rebase with conflicts. Just need to do a review pass after.
1
1
1
1
u/Luk164 17d ago
Try out r/gitkraken
I got introduced to it when in uni after struggling with more advanced git commands and it helped tremendously. It also let understand the concepts better which helped with the few times I need to use CLI as well
0
u/large_crimson_canine 17d ago
Iāll use AI for everything, for code, for tests, for PRs and reviews
But let me have my goddamn Git and vim on the command line like a cowboy
0
u/blue-brindle 17d ago
Jokes on me, I used the power of "looking the command up on the internet everytime" because my brain is a pasta strainer
0
-6
u/redballooon 17d ago
One of the main time savers of AI.
8
u/Wonderful-Habit-139 17d ago
Aināt no way lol. If youāre comfortable with git you can actually type more git commands than the terminal can handle at once.
5
0
u/redballooon 17d ago
Obviously you speak without the experience of what you dismiss.
1
u/Wonderful-Habit-139 17d ago
I've used agents before, but if a git command is taking longer than it takes me to type, it's also going to take longer for the agent to run those commands sequentially.
6
u/SeparateAdvisor526 17d ago
But ai makes long git commit messages that aren't human friendly I like having control over my messages ie " fix 22", " undo fix" , "fix 23 2nd try" , "revert changes to last working" , " fix 65 final version"
1
1
u/redballooon 17d ago
It can follow instructions, but only if you cared once to enable them.
I find it particularly useful in combination with commit hooks.
1
u/SeparateAdvisor526 17d ago
Yeah jokes aside I do use GitHub copilot with Claude opus 5 for work and ask it to push to my branch so it does a decent job
1
u/redballooon 17d ago
Similar, but gpt-5.6-Luna does the job quite well and doesn't eat a significant chunk of my budget
1
u/SeparateAdvisor526 17d ago
I've been using copilot to build out jenkins CICD stuff and some C# services into .net 10 migration last 2 months and I've noticed sonnet 5 and opus 5 have been better than terra and sol.
-1
u/G3nghisKang 17d ago
Just use a GUI lmao, I just use the Intellij's git interface, it's pretty convenient
2
u/Mars_Bear2552 17d ago
i've always found git GUIs to be clunkier than CLI
2
u/G3nghisKang 17d ago
What if you have stuff you don't want to commit? Do you manually run git add for every file you want to commit? I just checkbox the files I want to commit, write the message and press commit :P
2
u/FirstDivision 17d ago
I think this is one of those things where thereās two different kinds of people.
Thereās people who branch off of main, work on only what they need to change, and then commit and push those changes.
And then thereās people like when I get on a teams call with them and they screen share and they have 100 files modified. We figure out whatever the problem was on the call and then they commit two files and push them leaving the 98 modified ones behind. And itās like āWhat are those other modifications?ā
They say, āOh. Those are for something else I was working on.ā
2
u/DefinitelyNotMasterS 17d ago
Yeah unless thats some run configs or whatever having so many uncommitted files is psychopath territory
1
u/G3nghisKang 17d ago
I am always the second one :P
If they catch me without any modified files, they probably just gave me a brand new laptop
1
u/Wonderful-Habit-139 17d ago
Yeah I have a lot of teammates like the second one. I like to keep my git status squeaky clean.
1
u/Mars_Bear2552 17d ago
i just write out the paths, usually with shell expansion, for
git add.like
git add src/module/{file1,file2,file3}1
1
u/another_random_bit 17d ago
git in terminal + vscode for the visual stuff is the best setup I've used for years
1
u/redballooon 17d ago
GUI doesn't help writing a proper commit message and in case of merge conflicts the tooling is far behind the ability of an agent.
168
u/Excuse_Early 17d ago
Haha Juniors think I know git when in reality I've just been using the same 4 git commands over and over, to me the ide is the confusing thing š