New User Track Editing Advice?

Hi all.  I'm a relatively new X1 Producer user and I have what is probably a simple question for you veterans.

A friend of mine was going to record an acoustic guitar track for me.  He got about half way through perfectly, but going into the second chorus, he made an error and stopped.  We then created a second track and after the metronome count in he basically picked right up where he had left off and finished the song up.

My question is this:  what is the best way to begin approaching blending those two tracks together so that it is seamlessly combined into one track without any popping, timing problems....etc?

I'm willing to learn and give it my best shot, but I'd appreciate anyone who can at least get me going in the right direction.  Thanks in advance.

You may want to check into punch-in recording the next time you record also.

If I understand the OP correctly, you started recording right where the error was.  In general, this is not a good approach.  You always want a good degree of overlap between takes so make a seamless cross-fade.

I never use punching in.  Just set your marker, hit record and go.  Using track layers works well.

+1 on punching in. 
I find it seamless tho you do need to have your settings (levels etc) the same.

As said there are lot's of ways to do re takes.

Here's my method:
Always clone the Blank track before starting so you have 2 identical tracks.  
Now record into the first track until you screw up.
Stop.
Slip edit back to the screw up or a logical point before it.
Un-arm track one  and arm track 2.
Place the now time a few bars before end of the first take.  
Hit R
Start playing along with last bit of first track and continue until you screw up again.
Stop.
Now slip edit the front end of the new track to point of the tail end of the first.
Now drag it up to the first track and drop it in place.
Just be careful you don't drop the new recording out of time, use snap to grid at 1/8 notes. 
 
If there is a glitch or pop you can mess with the slip edits and find a zero crossing point.
Carry on using track 2 as your recording track and track one as the depository of perfect material.
Piece of Cake.

Regarding Cactus and Bristol comments, yes, using Shift+drag keeps time straight and CTRL+SHIFT+drag makes a copy in the same place.
 
One of my obsessive behaviors is to hit record ahead of time and then use the scissors to trim the clip on an even quarter or eighth note.  This makes is way easier to move things around.
 
Example: Cut the clip so the clip itself starts exactly one beat before the Chorus (even if the acutal music starts several beats later).  Then to move it to another Chorus or to a different track, drop it exactly one beat before the Chorus.
 
With harmony parts or multiple vocal leads, I always cut the clips to start at the same relative times on all tracks.  (Example: All six harmonies start at xx:4:00 on Chorus 1 and yy:4:00 on Chorus 2, etc.)
 
You can type over the time in the Clip part of the Inpsector if you don't drag it right where you want it.  Example:  Inspector says clip starts a Bar:Beat:Tick 64:2:15.  If you type 64:1:0, the clip will move to the start of bar 64.