So when upgrading software packages sometimes you need to merge changes. My recipe in archlinux is as follows:
- Look for *.pacnew files.
- Retrieve the original version (from /var/cache/pacman) from the old source package.
- Use a 3 way merge tool between old version, current file and the pacnew file.
These are my options for merging: