13 Jan
2018
13 Jan
'18
12:17 p.m.
Dear Hugh and other gitExperts -- Once we've decided it's OK to merge in a pull request, do we merge, squash, or rebase? (Martin & I were looking at https://github.com/TEIC/Stylesheets/pull/292, but were not sure how to merge it in.)