Search icon CANCEL
Arrow left icon
Explore Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Conferences
Free Learning
Arrow right icon
Arrow up icon
GO TO TOP
Mastering Vim

You're reading from   Mastering Vim Efficient and effortless editing with Vim and Vimscript

Arrow left icon
Product type Paperback
Published in Jul 2024
Publisher Packt
ISBN-13 9781835081877
Length 300 pages
Edition 2nd Edition
Languages
Tools
Arrow right icon
Author (1):
Arrow left icon
Ruslan Osipov Ruslan Osipov
Author Profile Icon Ruslan Osipov
Ruslan Osipov
Arrow right icon
View More author details
Toc

Table of Contents (11) Chapters Close

Preface 1. Chapter 1: Getting Started FREE CHAPTER 2. Chapter 2: Advanced Editing and Navigation 3. Chapter 3: Follow the Leader Plugin Management 4. Chapter 4: Understanding Structured Text 5. Chapter 5: Build, Test, and Execute 6. Chapter 6: Refactoring Code with Regex and Macros 7. Chapter 7: Making Vim Your Own 8. Chapter 8: Transcending the Mundane with Vimscript 9. Chapter 9: Where to Go from Here 10. Index

Resolving conflicts with vimdiff

Often, during development, you’ll find yourself needing to compare some files—be it comparing different output or versions of a file, or dealing with merge conflicts as multiple developers collaborate on a single file. Vim provides vimdiff, a standalone binary that excels at file comparison operations.

Comparing two files

Using vimdiff to compare two files is fairly simple. Let’s look at two files in spam/kitchen/: kitchen/bacon.py and kitchen/egg.py. We’d like to know what’s different between the two.

Code location

The files from this example are available from https://github.com/PacktPublishing/Mastering-Vim-Second-Edition/tree/main/Chapter05/spam.

Open the files with vimdiff:

$ vimdiff kitchen/bacon.py kitchen/egg.py

You will be greeted by the following screen (how colorful the screen is will depend on your colorscheme):

Figure 5.13 – The vimdiff window shows the differences between kitchen/bacon.py and kitchen/egg.py.

Figure 5.13 – The vimdiff window shows...

lock icon The rest of the chapter is locked
Register for a free Packt account to unlock a world of extra content!
A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.
Unlock this book and the full library FREE for 7 days
Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of
Renews at €18.99/month. Cancel anytime