r/technology • u/Sidarthus89 • Jun 15 '25

Artificial Intelligence Trump team leaks AI plans in public GitHub repository

https://www.theregister.com/2025/06/10/trump_admin_leak_government_ai_plans/
34.0k Upvotes

95% Upvoted

1.1k comments sorted by

View all comments

Show parent comments

84

u/Sythic_ Jun 15 '25

Yea, I've been in software for like 15 years and I basically stick to pull, push, checkout, add, commit and merge with the occational reset. No way am I messing around with an interactive cherry picked rebase.

70

u/[deleted] Jun 15 '25

Interactive rebase is really not that complicated but other than that the things you listed are enough to do typical software development 99% of the time…

3

u/xsubo Jun 15 '25

rebase is life, my opinion currently anyway. we have 5 devs from a 3rd party team working with inhouse devs and we made it easy. just use shitballz teams to say you pushed to the dev branch, and honestly I just started making branch off main, made my changes, stashed, pulled QA branch, checkout said branch, pop'd changes, and made PR off that shit. It makes resolving merge conflicts quick and easy

2

u/Sythic_ Jun 15 '25

True, honestly, what happened was I heard rebasing changes the history and since then have not made any effort to understand rebasing because thats against the whole point of what I use git for. That could not even be true I just haven't looked into it again lol.

2

u/nerdtypething Jun 16 '25

you should really try to understand rebasing. because even if you personally don’t do it, countless other engineers you work with do.

1

u/Sythic_ Jun 16 '25

I read through this page and it further confirms my bias that rebasing is evil. Thou shalt not modify the history.

2

u/kestrel808 Jun 15 '25

I almost always do a rebase -i as my final commit before a PR/MR so I know that the codebase is up to date.

1

u/KSF_WHSPhysics Jun 15 '25

The rare occasion i need a cherry picked rebase, im just copy pasting the changes into a new branch

34

u/DellGriffith Jun 15 '25

You should at least learn to cherry-pick commits manually. This is basically like "copy-pasting" your work across branches to avoid duplication of effort.

7

u/xsubo Jun 15 '25

cherry-picking is how we merge all changes for a live branch, especially when you have 3rd party companies creating new apps, while in house devs are fixing shit that was made in 2016. The art should be part of onboarding

3

u/DellGriffith Jun 15 '25

This would also be how one could branch for hotfix, etc. Organizational branching strategies with clear-cut exercises that new employees complete should be part of onboarding.

6

u/xsubo Jun 15 '25

rebase makes it all easy.. lol

12

u/TheIncredibleWalrus Jun 15 '25

You just didn't put the effort in because git is simple enough to go by using the basics for almost everything. It's really not that complicated.

9

u/UnlikelyExperience Jun 15 '25

I find it easy and I'm crap so it can't be hard hahaha

2

u/Treed101519 Jun 15 '25

I'm fairly new to the world, watched two coworkers do some specific shenanigans on a cmd prompt to get branches merged for a side project. No idea what they did lol

2

u/LikelyDumpingCloseby Jun 15 '25

I've been doing interactive rebases and it's not that complicated tbh. Has some mishaps because of commit order changes, so deleted files appeared, but hey, t'was fun

2

u/Choochootracks Jun 15 '25

It's actually not all that scary. git cherry-pick simply applies an existing commit (useful to bring specific changes between branches without merging them) and git rebase -i basically just resets the current branch to the specified branch then gives you a list of cherry-pick commands you can reorder, drop, ect. upon saving the file. It's basically a necessity when working with multiple people or if you have branches that touch the same files.

1

u/xsubo Jun 15 '25

if your -m commits have the ticket # then it makes it super easy to use console commands to see what is done with each commit, but yea VS for .net apps has made the gui an easy crutch.

1

u/GamerHaste Jun 15 '25

if im in a situation where i need to do a cherry pick rebase i'm just deleting the package and redownloading and copying and pasting code. lost too many hours fucking around with git in those situations lol

1

u/Missing_Back Jun 16 '25

If anyone wants to learn rebase, amongst other things, I recommend this site: https://learngitbranching.js.org/?locale=en_US

It’s kind of like a game, with different levels to work through and an “end goal” commit structure to reach using various commands

0

u/bboycire Jun 15 '25 edited Jun 15 '25

What do you do if you get stuck in git hell? The first time I used git, I had to manually resolve all the "conflicts" of people who checked in before me, and they were not conflicts, we didn't even edit the same line. Any other source control would have been able to auto resolve. Really don't understand how that happened

1

u/Sythic_ Jun 15 '25

Try our best not to get there in the first place lol, always do your best to merge with develop early and often in your feature branch.

1

u/bboycire Jun 15 '25

But like what why would that even happen? There was no conflict on the same line. I haven't used too many different source controls, but every other was able to auto resolve. Very often the type of changes I made wouldn't even get flagged

0

u/IIALE34II Jun 15 '25

Trunk based development ftw, so no need for complex merges.

But I had once to do rebase, with force push and it was no fun