Enoah NetzachCherry-picking without conflictsSometimes it’s useful to exclude certain commits from a merge: don’t do it the painful wayNov 27, 2017Nov 27, 2017