I am a newbie to Git/Github (particularly merging process when there are conflicts) and so all of this terminology is really confusing to me. Could someone explain what my i
