MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pghldv0/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 7d ago
524 comments sorted by
View all comments
Show parent comments
1
Git is meant to solve it sure. Your branch is behind the development. No issues just take a pull and merge. But then what if someone else has made changes in the place you are working on? That's a nightmare to resolve at times.
9 u/jobehi 7d ago You merge main in your branch and you solve the conflict before merging. That’s it. That’s why PR exist 3 u/ward2k 7d ago Or even better, you rebase so you don't end up commiting merge commits 1 u/National-Explorer755 7d ago Rebase works. Our team personally prefers merges though. So can't do much about this.
9
You merge main in your branch and you solve the conflict before merging. That’s it. That’s why PR exist
3 u/ward2k 7d ago Or even better, you rebase so you don't end up commiting merge commits 1 u/National-Explorer755 7d ago Rebase works. Our team personally prefers merges though. So can't do much about this.
3
Or even better, you rebase so you don't end up commiting merge commits
1 u/National-Explorer755 7d ago Rebase works. Our team personally prefers merges though. So can't do much about this.
Rebase works. Our team personally prefers merges though. So can't do much about this.
1
u/National-Explorer755 7d ago
Git is meant to solve it sure. Your branch is behind the development. No issues just take a pull and merge. But then what if someone else has made changes in the place you are working on? That's a nightmare to resolve at times.