latest 16 messages by ExoticCarMan
+
[2015-04-27T23:13:39Z]
ExoticCarMan
Huh, interesting. It looks like the commit doesn't update until I sync
+
[2015-04-27T23:12:07Z]
ExoticCarMan
typically how long does a commit take to update?
+
[2015-04-27T23:03:02Z]
ExoticCarMan
lol
+
[2015-04-27T23:03:00Z]
ExoticCarMan
oh wait
+
[2015-04-27T23:02:05Z]
ExoticCarMan
Yes, except the updates are still not on github
+
[2015-04-27T23:00:29Z]
ExoticCarMan
I'm using git now
+
[2015-04-27T23:00:27Z]
ExoticCarMan
no
+
[2015-04-27T23:00:24Z]
ExoticCarMan
I tried to commit and it said "Your branch is ahead of 'origin/master' by 3 commits."
+
[2015-04-27T22:59:51Z]
ExoticCarMan
okay, so it told me to push first
+
[2015-04-27T22:59:46Z]
ExoticCarMan
what the hell?
+
[2015-04-27T22:53:45Z]
ExoticCarMan
yes, I'm using the Mac app
+
[2015-04-27T22:53:36Z]
ExoticCarMan
When I hit commit, it won't commit, and the "conflicts" are still present when I sync
+
[2015-04-27T22:52:36Z]
ExoticCarMan
it won't let me. it still says it conflicts
+
[2015-04-27T22:48:27Z]
ExoticCarMan
How do I resolve this conflict? In Xcode, it says my files are still marked as conflicting, but no lines are flagged
+
[2015-04-27T22:47:52Z]
ExoticCarMan
there are no conflict parts in my code, but it still says it's conflicting
+
[2015-04-27T22:47:34Z]
ExoticCarMan
Hello, I'm trying to resolve a conflict