berta...@ptitcanardnoir.org 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. 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. :) _______________________________________________ tails-dev mailing list tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev
