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: | DaiTengu |
---|---|
Location: | Appleton, WI |
Users: | 918 |
Nodes: | 10 (1 / 9) |
Uptime: | 15:15:03 |
Calls: | 12,177 |
Files: | 186,522 |
Messages: | 2,235,214 |