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: | Keyop |
---|---|
Location: | Huddersfield, West Yorkshire, UK |
Users: | 301 |
Nodes: | 16 (2 / 14) |
Uptime: | 218:45:13 |
Calls: | 6,745 |
Calls today: | 5 |
Files: | 12,272 |
Messages: | 5,369,514 |