So when upgrading software packages sometimes you need to merge changes. My recipe in archlinux is as follows:

  1. Look for *.pacnew files.
  2. Retrieve the original version (from /var/cache/pacman) from the old source package.
  3. Use a 3 way merge tool between old version, current file and the pacnew file.

These are my options for merging:

  • diff3 -m : Merges the changes into a single file (Use -m option)
  • diffuse
  • meld