I have been running 12/stable and noted that it won't be supported past the end of next year. This does not seem urgent, but it is getting closer. I pulled the source for 13/stable and everything went fine until I rebooted and attempted to run etcupdate -p. When I used etcupdate resolve, with which I am not too familiar, it appears that there are quite a few instances in which the new files are different. Three of the possibilities that are presented are r (consider it resolved), mine-full, and theirs-full. I would like to keep the changes that I made while I was using 12-stable. Hand editing might be tedious, but if not, would one of these options be suitable for resolving the conflicts, or something that I have not considered? I realize that many of you would consider this a basic question, but references to sources of information would be appreciated.
