Status of tree-sitter branch

Status of tree-sitter branch

[lkg.ch@pm.me]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

Hi

the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews?

Thanks,
Kiong-Gē.

[-- Attachment #2: Type: text/html, Size: 314 bytes --]

Re: Status of tree-sitter branch

[Fu Yuan]

> the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews?

Oh, I can pull master and resolve conflicts. It definitely need more time as we discuss and improve the api. The core features are totally well functional, though.

Yuan

Re: Status of tree-sitter branch

[Jostein Kjønigsen]

[-- Attachment #1: Type: text/plain, Size: 949 bytes --]

On 27.08.2022 01:33, Fu Yuan wrote:
>> the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews?
> Oh, I can pull master and resolve conflicts. It definitely need more time as we discuss and improve the api. The core features are totally well functional, though.
>
> Yuan

Just out of curiosity, I tried to do this locally a few days ago. The 
conflicts are very small, and just related to Makefiles and external 
dependencies. No actual C or Elisp files had conflicts.

Even as someone not regularly contributing to Emacs not tree-sitter, I 
could easily resolve those and get a working build.


-- 
Vennlig hilsen
*Jostein Kjønigsen*

jostein@kjonigsen.net 🍵 jostein@gmail.com
https://jostein.kjønigsen.no <https://jostein.kjønigsen.no>

[-- Attachment #2: Type: text/html, Size: 1819 bytes --]

Re: Status of tree-sitter branch

[lkg.ch@pm.me]

[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]

Indeed,

the conflicts are mostly line breaking changes in "configure.ac" but I just want to make sure I didn't fat finger the code base that leads to build failure.

Thanks,
Kiong-Gē

-------- Original Message --------
On Aug 27, 2022, 07:08, Jostein Kjønigsen wrote:

> On 27.08.2022 01:33, Fu Yuan wrote:
>
>>> the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews?
>>
>> Oh, I can pull master and resolve conflicts. It definitely need more time as we discuss and improve the api. The core features are totally well functional, though.
>>
>> Yuan
>
> Just out of curiosity, I tried to do this locally a few days ago. The conflicts are very small, and just related to Makefiles and external dependencies. No actual C or Elisp files had conflicts.
>
> Even as someone not regularly contributing to Emacs not tree-sitter, I could easily resolve those and get a working build.
>
> --
> Vennlig hilsen
> Jostein Kjønigsen
>
> jostein@kjonigsen.net 🍵 jostein@gmail.com
> https://jostein.kjønigsen.no

[-- Attachment #2: Type: text/html, Size: 2240 bytes --]

Re: Status of tree-sitter branch

[Fu Yuan]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]



> 在 2022年8月27日，上午7:14，gliao.tw@pm.me 写道：
> 
> Indeed,
> 
> the conflicts are mostly line breaking changes in "configure.ac" but I just want to make sure I didn't fat finger the code base that leads to build failure.
> 
> Thanks,
> Kiong-Gē

I’ve merged master and pushed to feature/tree-sitter.

Yuan

[-- Attachment #2: Type: text/html, Size: 703 bytes --]