lucy/nvim

Fork 0

native #2

Open

lucy wants to merge 0 commits from native into master

lucy commented

2026-06-02 18:29:44 +02:00

Owner

add shit from native branch

lucy added 3 commits

2026-06-02 18:29:44 +02:00

use blink v2 and add blink.lib 96a2413ed4

add nvim pack lock and luarc to gitignore fdf4ccdccb

fix merge conflict e09b1d6497

This pull request has changes conflicting with the target branch.

.gitignore

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'native' (#2) from native into master

Merge commit body

Reviewed-on: https://git.seele.rip/lucy/nvim/pulls/2

Merge pull request 'native' (#2) from native into master

Reviewed-on: https://git.seele.rip/lucy/nvim/pulls/2

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin native:native

git switch native

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff native

git switch native

git rebase master

git switch master

git merge --ff-only native

git switch native

git rebase master

git switch master

git merge --no-ff native

git switch master

git merge --squash native

git switch master

git merge --ff-only native

git switch master

git merge native

git push origin master

No reviewers

No labels

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

lucy/nvim!2

No description provided.

Rows
Columns