Thank you both! Matthias Koeppe schrieb am Donnerstag, 15. September 2022 um 18:17:11 UTC+2:
> On Wednesday, September 14, 2022 at 11:40:12 PM UTC-7 seb....@gmail.com > wrote: > >> What is the proposed workflow to merge the develop branch after a new >> release into PR (or other) branches of your fork (i.e re-basing)? Obviously >> this is possible by pushing on sync in the web interface or typing gh >> repo sync USERNAME/sage -b branch in the command line. But how do you >> resolve conflicts? >> > Like Dima explained, all of the PR syncing is just additional convenience. > You can continue to just do all merging on your computer using the very > same git commands and just push the updated branch to your repo. It will > then be automatically reflected in the PR. > > >> If a PR is linked to the Issue, you can alternatively comment on the PR. >> >> It sounds like wasting time by searching for comments. Can’t we define a >> preference here? This seems to be a part of the decentralized structure >> that Travis is criticizing. >> > In actual practice, this is a non-problem, it is obvious where a comment > should go. > And in fact, also on Trac we often have overlapping discussions in related > tickets, and Sage developers have been able to navigate this quite well. > But yes, we can provide explicit guidance to Sage developers. I've added a > few bits to > https://github.com/sagemath/sage/wiki/migration-from-trac-to-Git**b in > this direction. Help is welcome in expanding this. > > > > -- 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 view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/97302f85-b937-4859-815d-85092eb3596fn%40googlegroups.com.
