Robert Chen – My 8th Grade Git Adventures Merge Conflicts & Coding Lessons Learned
Editor’s Note: On all dive certifications, we try to edit the writing as little as possible to preserve authenticity, personality, and writing style. We typically fix spelling errors, but minimally modify grammar and sentence structure (just enough to ensure readability).
1. When and Why Did You Decide to Pursue This Dive At This Level? What was your inspiration and motivation?
I’m not sure if I can accurately say that I fully understand the purpose of an online repo at the time I joined. I think that there are a lot of different reasons for people to use online repos. Some people just want a place to put their code. Some people like the idea of having a version control system. Personally, I use it for the latter reason, and it wasn’t long before I recognized the usefulness of using git and github for this reason.
2. How Long Did It Take For You To Accomplish This Dive At This Level From The Day You Decided To Pursue It, And Why Did It Take That Long?
3. What Was The Hardest Part About Achieving This Particular Dive Level?
4. What Was The Easiest Part About Achieving This Particular Dive Level?
5. What Is Your Advice For Someone Who Is Pursuing This Dive And Level?
6. What Are Some Of The Best Resources You Recommend to Those Pursuing This Dive At This Level, And Why Do You Recommend Them? Please Include Relevant Weblinks, If Applicable.
Resource 1: Github - You can create your account here.
Resource 2: W3Schools Git - A great free tutorial on how to use Git.
7. Tell Us A Story Of One Of Your Adventures While Pursuing This Dive (At This Level).
Once I was working on a personal project (a cool game) for fun with a couple of friends. We had decided to use git because it allowed for easier version control and code sharing.
One day, I pulled the changes, and realized that there was suddenly a merge conflict. Usually we work on separate files so this rarely happens, but it turns out that some miscommunication occurred resulting in a new conflict.
I used google to try and find a solution but to no avail. I had no idea how to fix this issue. I ended up having to do a hard reset because I had messed up my local repository so much.
Lesson learned: sometimes, it’s easier to actually rewrite the code from scratch then to have to fix a complicated merge conflict.
8. What Evidence Did You Submit to Prove You Met the Requirements for This Dive and Level?
9. Will You Be Pursuing The Next Level For This Dive? If Yes, Why? If Not, Why Not?
10. What is the Break Diver's Creed?
And having made this post, and provided adequate evidence to the dive committee, Robert Chen is now hereby certified by Break Diving, Inc. as: Coder - Git - Level 1. Congratulations ! Thank you for being an inspiration to others!
Certificate number: 11
The author above wrote this WYSEguidance post as one of the certification requirements to become certified by Break Diving, Inc. for a dive completed. Would you also like to find greater success, happiness, and friendship, and make genuine supportive connections with others around the world pursuing your same dreams? Come join us at Break Diving and soon your story will be the next one you read about on this site!Read More Stories on the WYSEguidance Homepage