[05:00] <littlegirl> Hey there, I'm probably doing pulling and committing and all that in the wrong order, and as a result I've run into a snag where my copy diverges from the one on the server. Here's what I've got: http://paste.ubuntu.com/891753/ Any help with what I should do next so that I can push my commit without messing up jjesse's commits would be appreciated. (:
[05:55] <littlegirl> Hey there, I'm probably doing pulling and committing and all that in the wrong order, and as a result I've run into a snag where my copy diverges from the one on the server. Here's what I've got: http://paste.ubuntu.com/891753/ Any help with what I should do next so that I can push my commit without messing up jjesse's commits would be appreciated. (:
[06:32] <littlegirl> Hey there, I'm probably doing pulling and committing and all that in the wrong order, and as a result I've run into a snag where my copy diverges from the one on the server. Here's what I've got: http://paste.ubuntu.com/891753/ Any help with what I should do next so that I can push my commit without messing up jjesse's commits would be appreciated. (: