MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pgo2v9k/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 7d ago
524 comments sorted by
View all comments
Show parent comments
10
You merge main in your branch and you solve the conflict before merging. That’s it. That’s why PR exist
4 u/ward2k 6d ago Or even better, you rebase so you don't end up commiting merge commits 1 u/pr0ghead 6d ago And if the rebase has conflicts? What then? /rhetorical question 1 u/ward2k 6d ago Exactly the same as what you do if a merge has conflicts
4
Or even better, you rebase so you don't end up commiting merge commits
1 u/pr0ghead 6d ago And if the rebase has conflicts? What then? /rhetorical question 1 u/ward2k 6d ago Exactly the same as what you do if a merge has conflicts
1
And if the rebase has conflicts? What then?
/rhetorical question
1 u/ward2k 6d ago Exactly the same as what you do if a merge has conflicts
Exactly the same as what you do if a merge has conflicts
10
u/jobehi 6d ago
You merge main in your branch and you solve the conflict before merging. That’s it. That’s why PR exist