HELP with punching in guitar takes.

Okay, so I'm fairly new to recording bands and I keep running into this problem so tell me guys how you would approach it.



The guitarist is recording a guitar part that goes on for a very long time (no gaps at all just straight strumming or notes) so if they mess up, it's very frustrating to have them do the entire thing from the start again. Well, I know that's why there is an option to punch in. However when I punch them in where they messed up using punch record (with some pre-roll of course) and then I go edit, no matter how zoomed in I get to the wave form and try to match the two up and I still hear that "click" from file to file. Cross fading during a continuous guitar part is obvious as well.



So what method should I use to track these longer guitar parts with no gaps that they just can't seem to do in one take with a smooth edit by punching in?



Thanks in advance guys!