Should you rebase or merge to update feature branches in git? 发表于 2020-10-17 分类于 uncategorized Try rebase. If that dissolves into conflict-resolution-hell then give up, merge master into your branch and move on.” ~ Tim Abell Should you rebase or merge to update feature branches in git?