| SYSTEM INFORMATION | |
|---|---|
| OS type and version | Debian Linux 13 |
| Webmin version | 2.660 |
| Usermin version | 2.560 |
| Virtualmin version | 8.2.0 Professional |
| Theme version | 26.60 |
| Apache version | 2.4.68 |
| Package updates | All installed packages are up to date |
the application in friendica (NOT THE DOCKER VERSION)
gets this error when I try to update
root@server:/var/www/friendica# git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Keith