search

christoomey / vim-conflicted

Easy git merge conflict resolution in Vim
MIT License
271 stars 12 forks source link

Conflicted only shows two tabs #18

Closed JESii closed 2 years ago

JESii commented 5 years ago

Starting about 2-3 weeks ago, Conflicted shows only two windows. The first windows indicates that there are three windows: image

but there are only two active windows open.

Any suggestions as to what I should look for? Thanks, Chris

christoomey commented 5 years ago

Hi @JESii! Hmm, unfortunately not sure what the issue would be here. Did you update fugitive.vim any time recently? Conflicted builds on it, so that is my guess as to why it would have changed.

Also, and sorry to be pedantic, but is the issue around "tabs" or "windows"? Your screenshot is showing three tabs listed, but you're mentioning windows (aka "splits"). Can you clarify what the expected and observed behavior is?

JESii commented 5 years ago

Sorry - it's tabs, not windows. I tend to update all my plugins fairly regularly, so that definitely could be it. I'll update all my plugins now and see if that helps. Thanks!

geoffharcourt commented 5 years ago

I think vim-fugitive moved from a default 3-pane diff to 2-pane diff. I think the solution is to use :Gdiffsplit! now:

https://github.com/tpope/vim-fugitive/commit/9abe962c9d6248c1b76a25bacfcc0c1e5d2cfbc8

JESii commented 5 years ago

OK; thanks much! Have a great day.

geoffharcourt commented 5 years ago

I created #19 to fix this and it worked for me, but I'm not sure if the segfault reported in the fix proposed in #17 is fixed there.

christoomey commented 5 years ago

@JESii I've merged @geoffharcourt's PR. Can you pull the latest and give that a quick test and then share the results back here?

toejough commented 5 years ago

I just installed this plugin for the first time - seems like a much needed addition to my toolkit!

Unfortunately, I still only have two panes in the working view. I've confirmed that if I open the file myself and type :Gvdiffsplit! I get the three pane diff view I was expecting.

geoffharcourt commented 5 years ago

Something happened where this regressed since the last commit. I'm not sure if it's another fugitive change.

toejough commented 5 years ago

https://github.com/christoomey/vim-conflicted/pull/20 resolves it for me.