latest 11 messages by al-Rashid
+
[2014-09-17T23:43:23Z]
al-Rashid
Got things working. Thanks, VxJasonxV.
+
[2014-09-17T23:27:05Z]
al-Rashid
*There* we go.
+
[2014-09-17T23:26:50Z]
al-Rashid
Oh. Missed that line.
+
[2014-09-17T23:26:31Z]
al-Rashid
"merge: upstream/master - not something we can merge"
+
[2014-09-17T23:24:42Z]
al-Rashid
I didn't do it on purpose. I did it because I wasn't clear on what I was doing.
+
[2014-09-17T23:24:02Z]
al-Rashid
I managed to remove the default origin push and pull URLs while trying to link the upstream. Now, I don't know how to get them back.
+
[2014-09-17T23:23:00Z]
al-Rashid
Git-remote and I are not getting along well.
+
[2014-09-17T23:17:48Z]
al-Rashid
But now FOO's got 112 commits in it that aren't in BAR--I *think*--and I'm having the worst time trying to sync it.
+
[2014-09-17T23:16:38Z]
al-Rashid
I was able to struggle through pushing changes to BAR once I made them here, and then made a pull request and got my new material merged into the original project.
+
[2014-09-17T23:14:56Z]
al-Rashid
I recently forked a project. Let's say the project repository's address is FOO. My github account's local repository, whose URL is BAR, had a copy of FOO then that I fetched on my local machine to get a copy of that.
+
[2014-09-17T23:12:25Z]
al-Rashid
Is there someone I could bother one-on-one for some help? I'd rather not clutter up the chat here.