search

theicfire / vimsheet

Vim cheat sheet from beginners to pros
http://vimsheet.com
MIT License
624 stars 207 forks source link

A few new things added #3

Closed farooqkz closed 2 years ago

farooqkz commented 7 years ago

:next and :!command was added from my .viminfo file, the second is more useful for UN*X users. Also changed :tabe to :tabe [file].

farooqkz commented 3 years ago

@theicfire hello?

theicfire commented 2 years ago

Hi @farooqkz thanks for checking in! If you resolve the conflicts this looks good to me, I appreciate it!

farooqkz commented 2 years ago

Done. It's the first time I resolve a conflict, let's hope I've done it right.

theicfire commented 2 years ago

Hmm it looks like there are issues. If you now look at the diff (the "files changed" tab), it says you have added many parts I don't think you meant to. Now there are duplicate pieces of the file.

This looks like a really tricky merge to make because of how much I've changed. My recommendation is that you just manually redo the changes -- I think that will be the fastest solution.

farooqkz commented 2 years ago

redo == closing this PR and opening another one? seems like a good idea since my changes are trivial.