"HEAD" and Commit ID showing inside my code
After creating a pull request,
I see a two things I don't understand (lines 941 - 945 and 963 - 967):
here:
- 941 +<<<<<<< HEAD
- <my code change>
- 945 +>>>>>>> 68178ff366b6e59f85ad772c0711f826b5b494ef
and here,
- 963 +<<<<<<< HEAD
- <my code change>
- 967 +>>>>>>> 68178ff366b6e59f85ad772c0711f826b5b494ef
That ID on 945 & 967 is a prior commit,
Those extra lines (941, 945, 963, 967) are not in my local version.
I'm still learning git, and I don't see anything addressing this weirdness in the docs so far.
How do I clean those lines without making a mess?