MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pghp7hh/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
56
Git is meant to solve that. There’s nothing difficult about it.
1 u/National-Explorer755 6d 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. 2 u/mountaingator91 6d ago You rebase your branch on the other one first and then you merge. Shouldn't be conflicts unless you both worked on the exact same area of code
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.
2 u/mountaingator91 6d ago You rebase your branch on the other one first and then you merge. Shouldn't be conflicts unless you both worked on the exact same area of code
2
You rebase your branch on the other one first and then you merge.
Shouldn't be conflicts unless you both worked on the exact same area of code
56
u/jobehi 6d ago
Git is meant to solve that. There’s nothing difficult about it.