A complaint about merges is that they pollute the branch with merge comments. Rebase does this less.
In either case, it can be difficult doing the merge and verifying that the right changes get into the result if there has been sometime between main branch changes and the feature branch.
Distraction-free reading. No ads.
Organize your knowledge with lists and highlights.
Tell your story. Find your audience.
Read member-only stories
Support writers you read most
Earn money for your writing
Listen to audio narrations
Read offline with the Medium app
nderground was a social network designed for privacy. nderground.net never took off and has been shut down. See topstonesoftware.com and bearcave.com.
