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: | altere |
---|---|
Location: | Houston, TX |
Users: | 60 |
Nodes: | 4 (0 / 4) |
Uptime: | 14:30:04 |
Calls: | 516 |
Files: | 7,037 |
Messages: | 288,562 |