Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] add git conflcits picker #2868

Closed

Conversation

Snikimonkd
Copy link

@Snikimonkd Snikimonkd commented Jan 13, 2024

Description

git conflicts picker

This is a draft, kind of proof of work, i'll add doc and all others later.

Type of change

  • New feature (non-breaking change which adds functionality)
  • This change requires a documentation update

How Has This Been Tested?

2024-01-14.00.08.57.mp4
  • created two branches with changes in the same files

Configuration:

  • Neovim version (nvim --version): v0.9.4
  • Operating system and version: macos ventura 13.5.2

Checklist:

  • My code follows the style guidelines of this project (stylua)
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (lua annotations)

@Snikimonkd Snikimonkd marked this pull request as draft January 13, 2024 21:34
@jamestrew
Copy link
Contributor

Unfortunately, we aren't really accepting new pickers into telescope core.

In short, we're struggling to maintain the existing ~50 pickers.
See #1228 for more info.

My recommendation is to create the picker as a standalone telescope extension https://github.com/nvim-telescope/telescope.nvim/blob/master/developers.md#bundling-as-extension

@jamestrew jamestrew closed this Jan 13, 2024
@Snikimonkd
Copy link
Author

@jamestrew, ok, i've read the doc, can you give me an example of simple standalone picker for telescope please, cause i'm not very familiar with lua and telescope code, so i need some reference :)

@Snikimonkd
Copy link
Author

I've found the examples, sry for disturbing, nvm

@jamestrew jamestrew mentioned this pull request Jan 18, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants