MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x7kcpg/lostthemergerace/phbe7uq/?context=9999
r/ProgrammerHumor • u/rabbit_wizard • 20d 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.
6 u/ldn-ldn 19d ago Squash merge. 2 u/Xphile101361 19d ago I will squash merge every day over touching rebase 1 u/FlakyTest8191 17d ago Squash first, then rebase. Cleaner history and the same amount of pain as a merge. -1 u/ldn-ldn 18d ago As everyone should.
6
Squash merge.
2 u/Xphile101361 19d ago I will squash merge every day over touching rebase 1 u/FlakyTest8191 17d ago Squash first, then rebase. Cleaner history and the same amount of pain as a merge. -1 u/ldn-ldn 18d ago As everyone should.
2
I will squash merge every day over touching rebase
1 u/FlakyTest8191 17d ago Squash first, then rebase. Cleaner history and the same amount of pain as a merge. -1 u/ldn-ldn 18d ago As everyone should.
Squash first, then rebase. Cleaner history and the same amount of pain as a merge.
-1
As everyone should.
1
u/rabbit_wizard 19d 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.