SVK::Resolve(3)

📦
version 2.2.3 · 2 versions
, in fedora 43

hey bestie 💖 you just opened the SVK::Resolve(3) page, and yes it lives in the User Contributed Perl Documentation. it's giving "interactive conflict resolution" and honestly? iconic. let's go 🦋

✨ NAME ✨

SVK::Resolve — interactively resolve conflicts. that's the whole point, no cap 💅

💖 DESCRIPTION 💖

okay so here's the menu of moves when you're resolving a conflict. pick your fighter, bestie:

🫶 Accept

  • a — Accept the merged/edited file.
  • y — Keep only changes to your file.
  • t — Keep only changes to their file.

🔍 Diff

  • d — Diff your file against merged file.
  • dm — See merged changes.
  • dy — See your changes alone.
  • dt — See their changes alone.

✏️ Edit

  • e — Edit merged file with an editor.
  • m — Run an external merge tool to edit merged file.

🎀 Misc

  • s — Skip this file.
  • h — Print this help message.

🌈 Environment variables

  • EDITOR — Editor to use for 'e'.
  • SVKMERGE — External merge tool to always use for 'm'.
  • SVKRESOLVE — The resolve action to take, instead of asking.

xoxo, that's the entire page fr fr. this was SVK::Resolve(3), from perl v5.42.0, dated 2025-07-25. periodt 💅✨

📦 where this page comes from