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

2020-08-28 Thread Dima Pasechnik
On Fri, Aug 28, 2020 at 4:19 PM 'Reimundo Heluani' via sage-devel wrote: > > > > On August 28, 2020 10:00:49 AM GMT-03:00, Michael Orlitzky > wrote: > >On 2020-08-28 08:40, 'Reimundo Heluani' via sage-devel wrote: > >> On Aug 28, Michael Orlitzky wrote: > >>> On 2020-08-28 08:23, 'Reimundo Helua

[sage-devel] Fwd: You've been approved for GitHub Sponsors

2020-08-28 Thread Dima Pasechnik
Please share widely - one can now sponsor SageMath via GitHub "Sponsor" button on https://github.com/sagemath (see also https://github.com/sponsors/sagemath for details - and let me know whether it should be improved/changed) -- Forwarded message - From: GitHub Date: Fri, Aug 28,

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

2020-08-28 Thread 'Reimundo Heluani' via sage-devel
On August 28, 2020 10:00:49 AM GMT-03:00, Michael Orlitzky wrote: >On 2020-08-28 08:40, 'Reimundo Heluani' via sage-devel wrote: >> 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 w

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

2020-08-28 Thread Michael Orlitzky
On 2020-08-28 08:40, 'Reimundo Heluani' via sage-devel wrote: > 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

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

2020-08-28 Thread 'Reimundo Heluani' via sage-devel
On Aug 28, Dima Pasechnik wrote: On Fri, Aug 28, 2020 at 1:23 PM '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 :) well, why, just doing git diff against another branch does not touch your curre

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

2020-08-28 Thread '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

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

2020-08-28 Thread Michael Orlitzky
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 (lik

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

2020-08-28 Thread Dima Pasechnik
On Fri, Aug 28, 2020 at 1:23 PM '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 :) well, why, just doing git diff against another branch does not touch your current tree. But, well, you are bett

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

2020-08-28 Thread 'Reimundo Heluani' via sage-devel
Thanks, I guess recompilation is unavoidable then, the worst part is that it was one of my own tickets :) R. On Aug 28, Dima Pasechnik wrote: On Fri, Aug 28, 2020 at 12:39 PM 'Reimundo Heluani' via sage-devel wrote: Hello, I am not familiar with the Trac server, I have a branch based on 9

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

2020-08-28 Thread Dima Pasechnik
On Fri, Aug 28, 2020 at 12:39 PM 'Reimundo Heluani' via sage-devel wrote: > > Hello, I am not familiar with the Trac server, I have a branch based on > 9.2.beta2 locally that fails the automerge on trac. I suppose something > changed between 9.2.beta2 and 9.2.beta10. Is there any way of seeing the

[sage-devel] check merge failure on Trac

2020-08-28 Thread 'Reimundo Heluani' via sage-devel
Hello, I am not familiar with the Trac server, I have a branch based on 9.2.beta2 locally that fails the automerge on trac. I suppose something changed between 9.2.beta2 and 9.2.beta10. Is there any way of seeing the logs to check what are the conflicts on the Trac server instead of trying to me