Another option is to use git worktree to create a second copy of the source
tree in the repository.
$ git worktree add my_worktree
$ cd my_worktree/
$ ln -s ../upstream/ .
This creates a subdirectory with a copy of all source files, where one can
merge the branches without touching the main tre
I normally do
$ git checkout -b local_branch develop
$ git pull trac branch_on_trac
This will add a merge commit, but it will allow you to do the diff and not
recompile.
Best,
Travis
On Saturday, August 29, 2020 at 1:51:09 AM UTC+10, Dima Pasechnik wrote:
>
> On Fri, Aug 28, 2020 at 4:19 PM
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
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
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
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
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
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
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
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
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
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
12 matches
Mail list logo
