your everyday nerd
I just got walloped after I performed a git pull origin master on my project. Two files ended up failing the auto merge and were left with conflicts.
I hope I edited them properly …
The girls had their annual pumpkin carving. Always a good time.
I did pretty well. Worked on 7-8 different bugs and got pretty acquainted with the project. I like it so far, even though I’m still on a PC! Maybe I can work my way onto a Mac soon. Others on the team use Mac and I’m hoping that after earning a little trust and respect I can get one too. At least maybe I could use my own.
Anyways, it was a good first week. I’m happy.