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: | 920 |
Nodes: | 10 (1 / 9) |
Uptime: | 91:57:56 |
Calls: | 12,188 |
Files: | 186,527 |
Messages: | 2,237,240 |