[Ohrrpgce] recommended workflow for merging a git feature branch before dcommit

[James Paige]

Hey, TMC, what workflow do you use when you want to merge a feature branch
before you "git svn dcommit" it?

I remember being warned that ordinary merges are a source of problems.

---
James
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.motherhamster.org/pipermail/ohrrpgce-motherhamster.org/attachments/20170904/0c38ad04/attachment.html>