latest 16 messages by ExoticCarMan

+ [10 years ago] ExoticCarMan Huh, interesting. It looks like the commit doesn't update until I sync
+ [10 years ago] ExoticCarMan typically how long does a commit take to update?
+ [10 years ago] ExoticCarMan Yes, except the updates are still not on github
+ [10 years ago] ExoticCarMan I tried to commit and it said "Your branch is ahead of 'origin/master' by 3 commits."
+ [10 years ago] ExoticCarMan okay, so it told me to push first
+ [10 years ago] ExoticCarMan When I hit commit, it won't commit, and the "conflicts" are still present when I sync
+ [10 years ago] ExoticCarMan it won't let me. it still says it conflicts
+ [10 years ago] ExoticCarMan How do I resolve this conflict? In Xcode, it says my files are still marked as conflicting, but no lines are flagged
+ [10 years ago] ExoticCarMan there are no conflict parts in my code, but it still says it's conflicting
+ [10 years ago] ExoticCarMan Hello, I'm trying to resolve a conflict