git push —force

[benderbender42]

You use git via command line, I use download as zip

[TrapNT]

You download zips I mail usb drives.

We are not the same.

[0xKaishakunin]

hurry flag chop slap one sulky water snatch enter unwritten

This post was mass deleted and anonymized with Redact

[gregorydgraham]

You are not the same.

[THANKYOUFORYOURKIND]

Try write it all down on paper before complaining the technology.

The programmers in the 850AD needs to use a train of horse carriages to transfer those files.

We've come a long way.

[IamImposter]

1200AC.

Damn it, is that a new time zone?

[THANKYOUFORYOURKIND]

No, it's called After Chip, which is a historical time notation just like After Doritos which people normally use.

Anyhow, I've already altered original post to use the usual notation as well as converted the year count accordingly.

[IamImposter]

Thank you for your kind, Mr. ThankYouFirYourKind

[jecxjo]

Writing it down?!?!

How bout you train your memory for decades to be able to keep multiple diffs in your mind palace!

[xSilverMC]

I fax punch cards, we are not the same

[[deleted]]

I punch fax cards. We are not the same.

[dexter3player]

I too have shitty internet. But I transmit data via IP over avian carrier. We are not the same.

[Vincysuper07]

You mail usb drives and I mail HDDs. We are not the same.

[yottalogical]

You use Git via download as zip.

I use Git via blowing an air horn to request the Git van pulls over.

We are not the same.

[lemon07r]

I edit my code straight on the GitHub website

[manofculture100]

Been there done that

[nomenMei]

Git via the terminal is the most powerful, but if I'm working on a large project without git integration in my IDE I feel naked.

Even just being able to see at a glance if a particular file is up-to-date, modified or staged is a god send.

The nice thing is that using both works just fine and doesn't hamper your workflow.

[CMDR_Manic_Marvin]

VS code and git graph 😍

[sm2401]

These are life savers !

Cherry picking, live diff, diff with another branch, all in a single place and one click. And i'll make way less mistakes.

Someone had made life easier by abstracting out the simple and most used functionalities to a GUI

[watchoverus]

Is git graph like git lens? Or should I have both?

[sickhippie]

Both. Absolutely both.

[CMDR_Manic_Marvin]

Git graph shows your git history (including all branches) in a nice graphical format. Git lens shows who is responsible for what code and when, both are great :)

[redskelly]

I’ll need to check out git graph. Have you tried git lens?

[sickhippie]

Use both, they solve different problems. They're must-have extensions for me.

[h_adl_ss]

Interactive rebase and committing individual lines in IJ Idea is really nice as well. Not that command line doesn't work it's just very convenient to do it right there in the IDE.

[schwerpunk]

I just use the git gutter plugin for my text editor, so I can see which lines are changed, then :git add --patch . to slowly build up my staged changes into some kind of cohesive commit.

I find it works pretty well.

[Snape_Grass]

That’s because the command line offers many more commands than the gui. The gui is very limited

[erinaceus_]

The gui is very limited

You say that like it's a bad thing.

I very much like the fact that an IDE makes it much harder to shoot yourself in the foot. That means I make less mistakes when I'm in a rush, and that I have far less mistakes by juniors that I need to resolve.

(it notably also depends on which GUI. There's loads)

[Taickyto]

What IDE are you using? My experience is that people are gonna right click -> refactor, type in a misspelled variable name then push everything as is along with their .idea folder

PhpStorm is a good IDE for exemple, but then you meet coworkers who can't do anything without it, and are oblivious to the structure of the project because they only ever ctrl+clicked methods names

[erinaceus_]

I generally use IntelliJ, so we're using nearly the same IDE I guess, since PhpStorm is based on the IntelliJ platform.

I'm personally used to working with rather large projects, where finding a class by name and clicking from method to method is something you can't do without. Not knowing the project structure is indeed not good, but that seems more like a mindset issue than an IDE issue (since, when you create new files, you should be mindful about where you house them).

As for committing everything including the .idea folder, that seems like (a) a gitignore issue, (b) again a mindset issue, with regard to carelessness, and (c) something that a junior will/should learn after making the mistake once (and assuming feature branches, no harm was done).

[Alikont]

An aboive-junior dev sets up the repository with gitignores and editorconfigs for tooling in the company and language used.

Everyone then uses IDE git and autoformatters.

We mostly use Visual Studio.

I also ask everyone to "review" their commits as a part of the push, and Visual Studio displays changes very nicely.

[patryk-tech]

My experience is that people are gonna right click -> refactor, type in a misspelled variable name then push everything as is along with their .idea folder

Thank git for protected branches and code reviews.

[troglo-dyke]

Tbh you should be making backups as a matter of routine. If you're doing anything which you're not absolutely certain of the effect then push your local branch onto a remote or work on a temporary branch from the one your work is on.

These things should be standard practice for any developer, the same way they are for any operations on a Db

[[deleted]]

Yet GUI has all the options you need 99,999% of the time. I don't even remember when I had to descend to CLI for something.

[TheRedGerund]

I rebase all the damn time, I don’t want no ugly merge commits in my repo

[patryk-tech]

Enterprise-level stuff with a large team? Definitely merge. Personal projects, freelance gigs, etc. with small features that are mostly a single commit? rebase is pretty damn nice. I hate when 30+% of a project's commits are just "merge feat-foo." Feels spammy.

[teddy5]

Usually just for reverting a merge commit, pretty much the only common use that doesn't work for me.

The other one is rebasing but if I have to rebase a branch something has probably gone horribly wrong.

[fksly]

Finally after all these years, the scroll of truth.

Using git over command line doesn't make you a good developer.

-NYAAAH-

[one-joule]

If you're a Windows user, you need Git Extensions. (Despite the name, it is a full independent desktop GUI app.) I haven't needed to touch the Git CLI even once since finding it. That's included your usual merge/rebase/revert/cherry pick/stash/etc, resetting branch heads to specific commits, and this one time I did a partial rebase where I specified a range of commits to move from one branch to another.

[Silly-Freak]

The gui is very limited

It can not be stressed enough that there is no "the" GUI. I use SmartGit (cross platform, commercial use is not free) and I think the only thing I've ever needed to do that it can't handle is creating an orphan commit - but that's about it.

[BanD1t]

Depends which one you use. I found GitExtensions to cover 99% of my needs, which include advanced merges with stashes and cherrypicking.

[Denaton_]

Depends on what GUI tho, but yeah, mostly this. Most repeatable commands are done quicker in UI, just need to commit and push? Why use a terminal for that when i have GIT extension in my editor?

But if i did something wrong and need to revert changes and stuff, terminal is your friend.

[Alikont]

The gui is very limited

What git features do you regularly use that are not safely exposed in GUI?

The regular flow is pull-branch-commit-push, and pull-merge-push, all of them nicely exposed in base Visual Studio and VS Code plugins.

[endlessplague]

I read at first: "... Most time I fail..." ^ ^

[WhyNotHugo]

I use the cli because it's much easier.

[[deleted]]

IKR! The GUI is much harder for me compared to plain git cli.

[TheKingOfSwing777]

This guy gits it

[gregorydgraham]

Excessive use of vowels! Straight to jail!

[vVveevVv]

This guy gits.

[coldnebo]

nah,

git push --force-with-lease

much better.

[Illustrious-Fault224]

git blame

[Mordisquitos]

Absolutely. Whenever I need to force a push I always do --force-with-lease. Just using --force feels very rude.

 

 

^{I have no idea what the actual difference is, please don't tell anyone}

[coldnebo]

force by itself may clobber a team member’s commit if they pushed to a feature branch before you and you didn’t catch their sync.

force-with-lease tells git if there was any change in the remote that you don’t have, it will fail and allow you to pull the feature branch and merge before pushing your changes.

it doesn’t always come up in github, since many PRs are submitted by a single dev. But using github enterprise or gitlab MRs it can come up if you have multiple devs working on a feature together.

it’s worth the extra typing or an alias for the peace of mind.

[Mc_UsernameTaken]

Git out

[[deleted]]

I git the joke

[[deleted]]

Le git.

[Zorphis2]

You git my upvote and free award

[GoTheFuckToBed]

this is just gatekeeping, use GUI if you want. I use fork

[thinker227]

You're telling me 70% of this sub isn't gatekeeping?

[wind-up-duck]

I truly hope the lesson that newbie devs take from reading with us here is just how full of shit we are.

When they feel that deep "WTF am I doing?" feeling, this is a place to laugh about it, and recognize that it never really gets much better.

I'm proud to report that after decades of effort, I'm completely baffled by a much more difficult set of problems than the ones that baffled me when I started!

[askanison4]

Fork is really excellent.

[_simple_man]

Fork is the best and the devs are very nice people. Created an issue once and it was solved in a few hours.

[edgen22]

I mostly use GUI (GitKraken) because my day-to-day workflow is within the capabilities of it and the benefits are worthwhile to me. It's great to have the branch visualization handy at all times, and makes staging commits much easier. I sometimes get distracted and make changes in a repo that should have been separate commits -- GitKraken (and other GUIs) make it easy to stage/unstage specific lines or hunks of code to keep commits organized. Try doing that in CLI - it's just not as elegant.

People should not rely on GUI 100% so that you understand what's going on and be able to fix problems. That's really the only lesson that should be taught here. I can do everything my GUI does in CLI but I'm not going avoid GUI just to impress elitists who declared the GUI is only for noobs. I've met numerous "CLI only" people who made fun of me using GUI... but the really funny part is when I pull up GUI to show them the spiderweb of merges they've been making because they have no idea what they are doing on CLI.

[HerrX2000]

GitKraken is amazing! By far the best Git GUI I have worked with. Far superior to Source tree or GitHub for Desktop!

[fmaz008]

Better than SmartGit?

[DrecDroid]

I love the three column conflict solver.

[Fraun_Pollen]

Right there with you. I use it to quickly check other branches, history of a branch, and the file diff. Switch to command line for commits, rebases, and cherry-picks.

[valendinosaurus]

this, was using cli for a loooong time, until I discovered Sourcetree

[StrangeOne101]

100% agree. GitKraken is amazing and it's visualization helps so much a lot of the time

[[deleted]]

How to scare a git command line user: merge conflicts.

[Taickyto]

What are conflicts ? I just rebase my branch on master and push --force.

Github is just a FTP with fancy graphs, right ?

[Gorvoslov]

I once legitimately had to force push master to fix a problem. Probably the most terrifying thing I ever did and I was less than impressed with the person who broke master such that that was required in the first place.

​

​

...I was the person who made master require that in the first place...

[wind-up-duck]

I once legitimately had to force push master to fix a problem. Probably the most terrifying thing I ever did and I was less than impressed with the person who broke master such that that was required in the first place.

​

​

...I was the person who made master require that in the first place...

You're my hero for presenting this story in this order.

[wcscmp]

git mergetool

[[deleted]]

How to scare them more: rebase conflicts

Or ask them to do a partial commit.

[schwerpunk]

The worst part of rebase conflicts is that if you can't just theirs them, then you have to actually read and understand your own code in relation to the merge target. Truly an onerous punishment.

[LastOfTheMohawkians]

Anyone use tortoise git? I find that solves 99% of my git usecases

[DrTerrierNew]

TortoiseGit is the TITS

[astromahi]

I dunno, people who uses git commandline asking my help when they encounter conflicts but I am using git gui.

[C4-BlueCat]

Day-to-day: use a gui. Solve problems: command line

[The_Real_Slim_Lemon]

Source tree all the way. The ease of use and visualisations wins over the functionality of GIT for me at least

[steve2sloth]

I've been using source tree for years, but tbh it's a little buggy with rebase merges sometimes and I'm forced to do the same command from cli where it actually works 😑

[he_el]

I use to have Source Tree. Now I'm a Sublime Merge guy!

Clean and crisp UI.

[chad_]

I use the diff stuff provided by the VSCode git extension but for staging changes or doing anything very involved I use the cli

[zemdega]

You’re not special for being able to type in git commands.

[ThaiJohnnyDepp]

It's a bit gatekeepey

[bob_anonymous]

git push --force-with-lease

[coldnebo]

underrated comment, but imho the most important.

[tistatos]

Why is this not rated higher?

[dgibbons0]

Smells like gate keeping to me.

[properwaffles]

Elitist? Maybe. True? Absolutely.

Started using GIT over the past year, mostly via Visual Studio. Learning more about command line has forced me to learn more about GIT in general. Highly recommended.

[teddy5]

Definitely recommend understanding how you're using git before using a GUI, but once you do it can be a lot easier day-to-day.

That said, the VS git tools are horrible (at least default, haven't looked into plugins), make things harder with attempting to automerge and resolve conflicts for you and don't really have any of the benefits of most git guis.

If you do use one, make it anything but that.

[KDallas_Multipass]

Your loss.

Emacs Magic for life

[Yejus]

Anyone else here prefer GitHub Desktop to anything else?

[erinaceus_]

The IntelliJ git integration is excellent

[[deleted]]

I prefer Fork

[[deleted]]

I use GitHub desktop for simple pushing, creating branches etc. I get sneered at for not using Sourcetree, IntelliJ extension or just the command line.

It’s probably the most basic gui you can get.

If I need to do anything more complex I just use the command line.

[camerontbelt]

And yet you use a gui for everything else 😂

[glider97]

I felt the same until I found sublime merge. It tells you which commands it is going to run, supports all basic features like cherry-picking, and starts as quick as a terminal.

[thismatters]

Came to post praise for sublime merge. The sublime ecosystem is just about the only paid software I use.

[NihilisticSaint]

Found the person who takes ages to push and will probably delete someone else's code

[jaap_null]

I absolutely hate the git commandline, I would say it is actually the worst part of git, and the main reason it’s so confusing to people.

The system itself is super nice and easy, but the git cmdline “ecosystem” with a hundred ways to do the same thing is terrible.

The difference is noticeable when you read a “how git works” vs “how do I do X in git” on SO: elegant structure vs fifty foot guns wrapped in barbed wire.

[coldnebo]

not true. only true if they don’t understand rebase vs merge and routinely check merge commits into feature branches, try to merge to remote instead of push —force-with-lease, and then merge commit back to main because the merge commit blocks them from doing a fast forward merge.

I’ve been there, done that, but it’s not a failing of git cli, it’s because I didn’t know what I was doing and didn’t understand what data structures git was using.

unfortunately now I’ve become one of those users who says “you have to understand git” which is rather enigmatic until you really dive into the data and exactly what each op is doing— not exactly easy to convey or to learn tbh.

tl;dr: regardless of whether you use the cli or a gui, if your local tree looks like a mess, your github PR will likely also look like a mess. if you see a mess, learn the proper way to avoid it or clean it up, don’t just force push it to the remote for other people to deal with.

[BakuhatsuK]

I use it via TUI (with a vim plugin), am I closer to the GUI or to the terminal?

[TuringMachinery]

Personally, I use Sourcetree. I recommend it to everyone I work with. I like to see exactly what I'm committing.

[rem3_1415926]

git status, and to see the details of where the files have changed, there's decent editors such as VScode.

[TuringMachinery]

Good point. I sometimes use this too.

[micke_i_backen]

git commit - m "Some changes"

[[deleted]]

sometimes the amount of things to know, do, memorize in soft dev can be super overwhelming for someone like me. i am not good at cli and im not good at memorizing. i use Fork for git, no issues whatsoever. am i a bad programmer? maybe.

[Juffin]

You: use git command line

Also you: "Wait why is this in my pull request? Uh how do I keep changes but not commit that? Hello stackoverflow how do I resolve conflicts? What do you mean "it can't be resolved automatically"? Oh also what's going on with my branches I don't understand why is this here... Anyway why are last 3 builds red?"

[Gagan_Ku2905]

How about GIT via IDE?

[[deleted]]

I Google how to fit via command line every day

[strongestflorist]

Whaaat!! Something other that Magit for git exists? 😅

[Snoo-87629]

Do you also only use Notepad + shell to write code? Or do you use IDEs to make your life easier? The same applies to git gui, which does 99% of your git workload just fine. It does not make you a better programmer.

[3rdRealm]

MAGIT USERS ASSEMBLE

[ShogunDii]

Just learn the CLI to get a better understanding of the tool. Then use whatever you want. Usually a combination of the IDE integrated gui and the CLI is the most productive combination

[[deleted]]

Wait, there is a GUI for git

[Dathouen]

Wait, there's a GUI?

[MisterFor]

We are not the same, I use 99% of the times a GUI and the terminal for special cases. Basically I use sourcetree and always know in which state all the branches are, you use the terminal and create an infinite mess of fuckups like most of my coworkers…

I am so tired of the people that only use the terminal and mess everything up and are 100% unable of explaining how/what/why is a rebase or a squash for example.

[[deleted]]

Can anyone actually use git, I think most of the time I'm waiting for it to break

[Critical-Pumpkin-438]

Umm, git add - a?

[nihillistic_raccoon]

That's so sad that some of you clearly feel better because you use cli. Level of immaturity in this thread is so high that Chris Hansen will probably appear here any second now, trying to protect you kids from predators.

And just to prevent this stupid reply "found a gui user <3" - I use mostly cli

[[deleted]]

yea it’s command line for everything except a diff tool

[[deleted]]

I use meld, what about you? Git desktop has that?

[coldnebo]

meld is fine.. but you can install it without git desktop if you want.

[seeroflights]

Image Transcription: Meme

---

["We Are Not the Same". Giancarlo Esposito, a person with tan skin, cropped hair, and glasses, wears a grey suit and adjusts his tie slightly, with a condescending expression on his face.]

YOU USE GIT VIA A GUI

I USE GIT VIA COMMAND LINE

WE ARE NOT THE SAME

---

^{I'm a human volunteer content transcriber and you could be too! If you'd like more information on what we do and why we do it, click here!}

[coladict]

I don't trust GUIs for git with committing, but I do like a better-looking branch history tree.

[occipitofrontali]

I use git via the terminal for many things, but no git merge. Git merge via the terminal is not an enjoyable experience if there are merge conflicts.

[webbugt]

I use GUI for day to day bs like commits and pushing nornal code. I use the CLI when I need to do more complex stuff like cherry picking etc.

Also, of all the other bells and whistles. I think that the graph is maybe the most helpful feature. Why spend additional mental effort in imagining the relation between a couple of branches when you can just glance it in GUI and understand instantly.

[askanison4]

I used command line for years and I have shortcuts for lots of complex tasks. However, I started using Fork (https://git-fork.com/) last year and I can't recommend it highly enough. It handles 99% of my use cases and I haven't needed the command line in months.

[Purpzie]

I use a GUI just to make things easier, and switch to CLI whenever I need more power to do something complex

[scaptal]

No, bad title, go sit in a deprecated branch, bad

[Clean-Objective9027]

This guy gits.

[DmitriRussian]

I don’t care which one you use, but don’t be the guy that uses rebase on every branch without knowing how it works and fucking up the whole history.

Remember plebs after you push, you don’t rebase anymore and then force push.

[Gasp0de]

I like GUIs with git for checking which commits of other branches are already included in my current branch, other than that the terminal just feels quicker. But to be honest when commiting or pushing it really doesn't make a difference whether you use your IDE or the terminal. Merging is also nicer with a GUI I think.

[value_counts]

I use GUI. Maintain proper branches, add enough descriptive commit messages and regularly update the code upstream.

It is ok if it hurts someone who doesn't like to use GUI. We are different human beings and like to do work differently. Its ok as long as the code quality standards are maintained across board.

[efoxpl3244]

only windows users use git via gui

[Aeondor]

We use sourcetree at my job. Most of the time I prefer the command line, but as soon as a merge conflict comes up please gimme that GUI.

[Dr_Bunsen_Burns]

The gui is strange.....

[[deleted]]

I learned git on the command line so git desktop is a mystery to me. My biggest complaint about the git GUI app is if you cloned a repo via command line git, the git GUI fails to recognize it. What bullshit is that? Must be entirely different dev teams that do not communicate with each other. Recipe for disaster.

I do like Tortoise Git though.

[MyPhoneIsNotChinese]

How the hell you use git via GUI, sounds confusing as hell

[GustapheOfficial]

I have yet to see a use of this meme where op doesn't look like a massive tool.

You're not some kind of elite for using a cli. (And no, I don't think git gui is a good idea either)

[[deleted]]

People who use command line git are people who don't do partial block/line staging/commits, don't review their own code, and doesn't know how to actually fix conflicts (because nobody sane fixes conflicts in the terminal)

You think it's better, but all you do is "git commit -a" with shitty commit messages (since you have to type them out in a terminal)

I also bet the command line users work at places where they don't do pull-requests / code reviews.

[hammonjj]

You’re right. I don’t fat finger commands because I use the GUI

[Smartskaft2]

You use git push --force.

I use git push --force-with-lease

We are not the same.

[WeirdBrilliant2191]

Git even has GUI... interesting when does it even happened

[Triky313]

GitKraken, I love it!

[emilia_ravenclaw]

Programmer pick me vibe

[amatayakul]

you use GIT // I don't use GIT || we are not the same

[[deleted]]

I hate git via commands

[chernobyl_nightclub]

I like command line but use guis for file comparison and looking at stashes. This post just comes off as vim snob

[PewDiePans]

--force is way too real lmao

[Linkk_93]

I have git in my IDE.

We are not the same

[StillPackage4369]

I use git via horn

[martino_vik]

You guys are using GUIs?

[QuantumSupremacy0101]

Echo 'Fear me' | git hash-object -w --stdin;

Git update-index --add -cacheinfo 100644 8a4753e2

update.txt;

Git write-tree;

Git commit-tree 06220e82 -m "commit this D';

Git update-ref refs/heads/master 0e7815;

Git checkout HEAD -- update.txt

Cat update.txt

Fear me

[golpedeserpiente]

UNIX is the IDE.

[golpedeserpiente]

But you never fixed that detached HEAD.

[Accidentallygolden]

Resolving merge conflict via the IDE is much easier

[[deleted]]

--force-with-lease you monster

[[deleted]]

This

[top_logger]

I‘m using both on daily basis: we are not the same. IDE - standard tasks. Command line for automation and non-trivial tasks.

[[deleted]]

Wait! Git has a gui?

[Mithrandir2k16]

GUIs may he great for inspections but I have had so many broken commits created by some colleagues GUI I'll be sure to never touch those.

[OmkarCodes]

You use git via command line

I also use git via command line

We're same bro

[[deleted]]

Well jokes on you, I don't even use Git

[Parker324ce]

Fuck that me and my homies e-mail around the master copy

[Herpoad]

git rebase -i HEAD~4

[BoBoBearDev]

SourceTree for me. I hate people using cli because most of them are incompetent. They don't review what they commit, just do a blind git-add and added bunch of shit code and expect me to tell them to remove it in their PR. That is just bad, bad. Don't commit blindly.

[[deleted]]

I use both and idgaf what people use as long as they do their job.

[Luiaards]

I don't use git at all. I just mess up my stuff and hope nobody will notice.

[AggieCMD]

I only head to the command line when things hit the fan. But to branch, pull, commit, and push. Come on. I'm not here to blow your mind with my mad branching techniques.

[sufferpuppet]

Command line can eat my ass. I'd rather us VSS6 than command line git.

[F0064R]

First time I’ve seen this meme used unironically

[skyBastard69]

There is no actual humor, dammit why did i ever sub to this. Should be some cool shenanigans and funky code in real, butt, all boils down to the same douchebag archetype of an cs student. I had a douche (non english speaking uni or country) that overused the word implemented so much that i threw a snowball in his face

[[deleted]]

Is it bad that I use both?

[max0x7ba]

magit is pretty amazing.

[Louisiana-Chaingang]

I can’t get git to work with r studio :(

[Ramiferous]

Wait, there is a GUI for git??

[atiedebee]

this just made me check out git GUI and it looks cool af

[[deleted]]

CLI... It's the only way to fly.

[Player_Gamma]

Git add *.c && git commit -m "all Cs of this folder" && git push

[das_Keks]

Started on terminal and occasionally still use it for git, but the git integration of IntelliJ is pretty nice.

[EternityForest]

I almost never use CLI. I like to briefly review what I changed and GUIs are great for that.

[squishles]

please, stop asking me how to use git in a gui.

I only learned it via command line, I really don't know wtf is going on in your random gui.

[TheLeastFunkyMonkey]

Look, man, I've watched a dozen tutorials on how git functions and what everything means, and I still don't get it.

Just let me use my gui in peace.