Re: [sage-devel] check merge failure on Trac

['Reimundo Heluani' via sage-devel]

On Aug 28, Michael Orlitzky wrote:

On 2020-08-28 08:23, 'Reimundo Heluani' via sage-devel wrote:

Thanks, I guess recompilation is unavoidable then, the worst part is that it 
was one of my own tickets :)

Dima meant "git fetch" literally. That will pull down the changes, but
won't try to merge them into your local branch (like "git pull" would).

yeah but looking at a diff would be impossible to find conflicts with such a large patch. The only way I know of is attempting a merge, and if there are conflicts this always results in changing the working tree.

R

--
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/0364d6e6-1d82-537e-694c-afe8fa7d05ea%40orlitzky.com.

--
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/20200828124007.GB3893914%40vertex.

signature.asc
Description: PGP signature