Am 2015-03-12 um 10:51 schrieb Nathann Cohen: >> There is nothing specific to our git setup as far as merging and rebasing is >> concerned. So there is no need to reinvent a git-trac wheel here, its just >> about making communicating with trac easier. > > I was thinking of some entry like "Merging with the latest release > (i.e. what should you do when the branch appears in red)". > > A sequence of 3/4 commands with comments would probably be sufficient. > With a link toward "how to upgrade your version of sage" or something.
Am 2015-03-12 um 10:55 schrieb Nathann Cohen: >> Where & when do you see something in red? > > Sorry, I was talking of the trac ticket. Here is one for instance: > http://trac.sagemath.org/ticket/16534 krenn@brown:/local/data/krenn/sage/rebase$ git fetch origin [...] krenn@brown:/local/data/krenn/sage/rebase$ git trac checkout 16534 Loading ticket #16534... Checking out Trac #16534 remote branch u/brett/design -> local branch t/16534/design... krenn@brown:/local/data/krenn/sage/rebase$ git merge 6.6.beta3 [...] Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen Sie dann das Ergebnis. krenn@brown:/local/data/krenn/sage/rebase$ git mergetool Merging: src/sage/combinat/designs/incidence_structures.py Normal merge conflict for 'src/sage/combinat/designs/incidence_structures.py': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (emerge): ...resolve conflicts (only one simple to solve one) here krenn@brown:/local/data/krenn/sage/rebase$ git mergetool No files need merging ...no more merge conflicts :) krenn@brown:/local/data/krenn/sage/rebase$ git commit -- 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 http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
