this post was submitted on 26 Aug 2023
1184 points (98.4% liked)
Programmer Humor
32710 readers
16 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Two new files wouldn't create a merge conflict though (unless they have the same name)?
Git won't let the second person push if their commit history doesn't line up with the origin branch.
It should be trivial to do a
git pull --rebaseto move your new commit after the upstream version, but as far as I can tell, no one on my current project remembers this (or perhaps they're using gui tools or something). Our log is full of "merge origin/main onto main".While we're at it, I like to use
--autostashin addition.Uuh, thanks for that hint! I've been using git over CLI for over 10 years now and never came across that flag.
i have autostash set up as part of global config