On Thu, Sep 27, 2012 at 09:26:51AM +0200, intrigeri wrote: > [email protected] wrote (26 Sep 2012 18:28:06 GMT) : > > My fault, I did a simple merge and forgot the --no-ff option :/ > > How can I solve this? > > We won't rewrite history for such a tiny detail, so you cannot solve > what already happened.
That's what I thought, asked just in case I missed a trick. > However, you may solve it for future cases by writing a "how to review > and merge a branch" checklist, that would contain often forgotten bits > such as "check that the design doc was updated", "check that user doc > was written and reviewed", "use --no-ff", "once merged, tag the ticket > pending", etc. Good idea. I think now I've made the mistake, it will already solve that part. But a documentation page would still be precious, so let's do that. bert. _______________________________________________ tails-dev mailing list [email protected] https://mailman.boum.org/listinfo/tails-dev
