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: | 792 |
Nodes: | 20 (0 / 20) |
Uptime: | 45:41:46 |
Calls: | 12,357 |
Files: | 5,294 |
D/L today: |
619 files (74,467K bytes) |
Messages: | 576,244 |