search

Ethandaniel47 / EdgarAllanPoeProject

Analysis of language pertaining to capture/enclosure and release in regards to the poetry and prose of Edgar Allan Poe
1 stars 0 forks source link

More Command Line Issues #11

Open Ethandaniel47 opened 5 years ago

Ethandaniel47 commented 5 years ago

Hey guys, Since I wont be around tomorrow for our meeting, I wanted to let you know that I have five more poems marked up and will be spending the day tomorrow working on updating and expanding the XHTML and CSS for the project page. I have, perhaps unsurprisingly, run into yet more issues with Command Line and Pushing to Git. I thought I had done it correctly, and yet none of my work is here, so I'm not sure what I am doing wrong and now every time I try to pull I get sucked into vim. After spending the better part of 16 hours traveling and waiting around bus terminals on little to no sleep, I am too frustrated with the technology to continue trying any more tonight. I will give it a go again in the morning, but I wanted to let you all know in case you're unable to find my work.

MJB288 commented 5 years ago

Everytime you pull, you get sucked into Vim? That means there's probably a merge conflict somewhere. I did rearrange the file system like I was asked to, so that may be it. Sorry to hear about your troubles, I wish you good luck on your trip.

gabikeane commented 5 years ago

We'll get your Git issues worked out when you get back-- for now, just try to enjoy the rest of your trip!

gabikeane commented 5 years ago

About Merge Conflicts and what we're working on right now