On Tue, Jan 31, 2017 at 3:54 PM, Emmanuel Charpentier <emanuel.charpent...@gmail.com> wrote: > Dear list, > > I proposed Trac#22189 to (start to) solve our OpenSSL conundrum. This patch > was originally one commit. At the suggestion of a reviewer,, I added a > second patch, changing the target Sage version. This second patch, somehow, > conflicted with 7.6.beta1. > > I squashed the two commits in one and forced an update. The merge with > 7.6.beta1 is still impossible without manual intervention. Could some king > suol point me to an answer to two simple questions : > > Where did goof ? > How to solve that ?
It looks like Travis already fixed it, so I'm not sure exactly what went wrong in this case. Personally, I use rebase more often than merge. Single-directional merges (such as merges from a development branch back into the main branch) usually make sense, but I find that bi-directional merges can get confusing fast. So I find it easier, in the course of development, to rebase my commits on top of the current master (or "develop" in sage's case). This is just like reapplying your commits against the latest HEAD of the master branch. If any of them don't apply cleanly you are given the opportunity to make any edits needed to make them apply again. This can also make it clearer exactly what your commits are supposed to be changing. Best, Erik -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
