+ [2015-04-27T23:12:07Z] ExoticCarMan typically how long does a commit take to update?
+ [2015-04-27T23:13:39Z] ExoticCarMan Huh, interesting. It looks like the commit doesn't update until I sync
+ [2015-04-27T23:22:57Z] VxJasonxV git isn't svn
+ [2015-04-27T23:23:13Z] VxJasonxV the commit was made, in your repository
+ [2015-04-27T23:23:24Z] VxJasonxV it isn't available elsewhere until you make it (by pushing, or in your case, sync'ing)

message no. 91422

Posted by ExoticCarMan in #github at 2015-04-27T22:48:27Z

How do I resolve this conflict? In Xcode, it says my files are still marked as conflicting, but no lines are flagged
+ [2015-04-28T06:43:51Z] jerkface03 Number of forks is set to 1 but the Network tab shows only me. Does this mean someone forked to a private repo?
+ [2015-04-28T06:56:00Z] VxJasonxV jerkface03: link?
+ [2015-04-28T06:56:41Z] VxJasonxV the answer is likely yes, that the forker made it private. but I just want to make sure I'm looking at the same thing
+ [2015-04-28T07:21:31Z] Nevik_ jerkface03, the network tab only shows other forks if they have any commits that your fork doesnt. the Members tab shows all forks, regardless of state. /cc VxJasonxV
+ [2015-04-28T07:21:59Z] Nevik_ forks of public repos cannot be made private while retaining their fork state, afaik, since they would then not work with PRs etc