Hi Qian, I definitely prefer rebase for simple commit. I do not like these extra merge commits.
In fact, FriCAS only has one non-linearity in the commit DAG. At that time I asked Waldek whether I should turn the merge into a rebase, but it was already public so I left it. Otherwise, at that time Waldek preferred to keep the commit DAG linear. Ralf On 21.01.21 14:14, oldk1331 wrote: > Hi Waldek, > > Which is your preferred way of merging PR? > > Merge directly or rebase? > > I prefer rebase because I like linear history. > > - Qian > -- You received this message because you are subscribed to the Google Groups "FriCAS - computer algebra system" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/fricas-devel/55117ca0-2fd4-8dad-e55f-1ca14945f907%40hemmecke.org.
