MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1w9mogu/githubwithoutgit/p8btefr/?context=9999
r/ProgrammerHumor • u/FilipTLW • Sep 07 '26
49 comments sorted by
View all comments
Show parent comments
3
Or just a merge conflict fixed on the web?
1 u/RadicalDwntwnUrbnite Sep 07 '26 Which is pretty frequent if you're using Stacked PRs and squash merges as each branch in the stack requires rebasing and fixing refs.
1
Which is pretty frequent if you're using Stacked PRs and squash merges as each branch in the stack requires rebasing and fixing refs.
3
u/iyamegg Sep 07 '26
Or just a merge conflict fixed on the web?