From: "Jostein Kjønigsen" <jostein@secure.kjonigsen.net>
To: Fu Yuan <casouri@gmail.com>, "lkg.ch@pm.me" <gliao.tw@pm.me>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: Status of tree-sitter branch
Date: Sat, 27 Aug 2022 14:08:39 +0200 [thread overview]
Message-ID: <e4a866a7-d22b-5112-e627-24d22b6db5d4@secure.kjonigsen.net> (raw)
In-Reply-To: <7DE2A6E0-FB41-4672-943D-69B44949E84E@gmail.com>
[-- 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 --]
next prev parent reply other threads:[~2022-08-27 12:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 21:42 Status of tree-sitter branch lkg.ch@pm.me
2022-08-26 23:33 ` Fu Yuan
2022-08-27 12:08 ` Jostein Kjønigsen [this message]
2022-08-27 14:14 ` lkg.ch@pm.me
2022-08-30 18:16 ` Fu Yuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e4a866a7-d22b-5112-e627-24d22b6db5d4@secure.kjonigsen.net \
--to=jostein@secure.kjonigsen.net \
--cc=casouri@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=gliao.tw@pm.me \
--cc=jostein@kjonigsen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).