Having issues updating, I tried to pull any changes and got the message:
```hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime
Sysop: | Chris Crash |
---|---|
Location: | Huntington Beach, CA. |
Users: | 557 |
Nodes: | 8 (0 / 8) |
Uptime: | 58:17:25 |
Calls: | 10,404 |
Calls today: | 1 |
Files: | 5 |
Messages: | 364,723 |