Unable to commit
Posted: 10 March 2024, 17:36
Hi,
I am at the point where I am trying to test minified css and js. Somehow this has resulted in a "conflict" when I try to commit my newest revision.
Specifically,
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/var/tournoi/games/distilledsugar/distilledsugar.js' remains in conflict
HAL says: done.
Is there any way I can look at the diff or find the conflict? I dont know what to make of this error since I dont understand or have insight into the version control system.
I am at the point where I am trying to test minified css and js. Somehow this has resulted in a "conflict" when I try to commit my newest revision.
Specifically,
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/var/tournoi/games/distilledsugar/distilledsugar.js' remains in conflict
HAL says: done.
Is there any way I can look at the diff or find the conflict? I dont know what to make of this error since I dont understand or have insight into the version control system.