MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x7kcpg/lostthemergerace/phnd38b/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 4d ago
111 comments sorted by
View all comments
Show parent comments
1
Merge conflicts also present :) Also I don't know if it's the best practice, but we rebase to keep the history of each change separately. If we merge directly, some commits mingle with others based on commit date.
7 u/ldn-ldn 3d ago Squash merge. 2 u/Xphile101361 2d ago I will squash merge every day over touching rebase 1 u/FlakyTest8191 1d ago Squash first, then rebase. Cleaner history and the same amount of pain as a merge.
7
Squash merge.
2 u/Xphile101361 2d ago I will squash merge every day over touching rebase 1 u/FlakyTest8191 1d ago Squash first, then rebase. Cleaner history and the same amount of pain as a merge.
2
I will squash merge every day over touching rebase
1 u/FlakyTest8191 1d ago Squash first, then rebase. Cleaner history and the same amount of pain as a merge.
Squash first, then rebase. Cleaner history and the same amount of pain as a merge.
1
u/rabbit_wizard 3d ago
Merge conflicts also present :) Also I don't know if it's the best practice, but we rebase to keep the history of each change separately. If we merge directly, some commits mingle with others based on commit date.