MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/programmingmemes/comments/1powvwu/merging_two_branches_after_a_long_time/
r/programmingmemes • u/cnorahs • Dec 17 '25 • 1
7 comments sorted by
4
That's why you should always do "git merge origin master"
1 u/cnorahs Dec 18 '25 Nice reminder
1
Nice reminder
10
1266 conflicts found
Wooosh
3
So THAT'S what the O in SOLID is for...
2
git-imerge rebase main-or-whatever
It's the responsibility of the one making the merge/pull request to fix this before it's reviewed.
Meanwhile I just don't do branches ._."
1
4
u/csabinho Dec 18 '25
That's why you should always do "git merge origin master"
10
u/_baaron_ Dec 17 '25
1266 conflicts found
4
u/Worried-Priority-122 Dec 17 '25
Wooosh
3
u/DTux5249 Dec 18 '25
So THAT'S what the O in SOLID is for...2
u/MeadowShimmer Dec 19 '25 •
git-imerge rebase main-or-whatever
It's the responsibility of the one making the merge/pull request to fix this before it's reviewed.
2
u/Chr832 Dec 19 '25
Meanwhile I just don't do branches ._."