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: | Gate Keeper |
---|---|
Location: | Shelby, NC |
Users: | 719 |
Nodes: | 20 (0 / 20) |
Uptime: | 182:16:11 |
Calls: | 9,287 |
Calls today: | 7 |
Files: | 5,288 |
D/L today: |
103 files (44,646K bytes) |
Messages: | 467,619 |