Author Gurmehak Kaur Solving merge conflicts takes conscious effort, but I can do it!
I like that version control allows me to track all the changes i make in my file, but i find using the terminal a bit confusing and and the cammends, difficult to memorise.