Page 1 of 1
Commit error
Posted: 07 July 2022, 09:03
by Tof63
Hello,
I have this error when I do a commit, could somebody tell me how to resolve this ?
svn: E155015: Aborting commit: '/var/tournoi/games/laserreflection/laserreflection.js' remains in conflict
Thanks !
Re: Commit error
Posted: 09 July 2022, 10:59
by junibegood
I'm more used to Git than SVN, so take this with a pinch of salt, but the general principle should be true as well.
This usually happens when several developpers work on the same repository and apply different modifications to the same lines of the same file simultaneously. SVN does not know how to merge these two modifications and refuses doing it unless you resolve the conflicts beforehand. Not sure how this can happen when working alone in your project in the studio though. I think it's more likely a technical issue than an actual conflict.
Anyway, to fix the error I would try this :
- Backup your up to date version of the conflicting file somewhere
- Erase it from the server
- Commit : it should be fine since the conflicting file does not exist anymore
- Put the file back on the server
- Commit again : it should be fine as well since you're creating the file, it may not conflict with an existing version of itself
Re: Commit error
Posted: 11 July 2022, 08:54
by Een
If you are still stuck, please write to
studio@boardgamearena.com for an admin to resolve the conflict.
Re: Commit error
Posted: 11 July 2022, 10:26
by Tof63
junibegood wrote: ↑09 July 2022, 10:59
I'm more used to Git than SVN, so take this with a pinch of salt, but the general principle should be true as well.
This usually happens when several developpers work on the same repository and apply different modifications to the same lines of the same file simultaneously. SVN does not know how to merge these two modifications and refuses doing it unless you resolve the conflicts beforehand. Not sure how this can happen when working alone in your project in the studio though. I think it's more likely a technical issue than an actual conflict.
Anyway, to fix the error I would try this :
- Backup your up to date version of the conflicting file somewhere
- Erase it from the server
- Commit : it should be fine since the conflicting file does not exist anymore
- Put the file back on the server
- Commit again : it should be fine as well since you're creating the file, it may not conflict with an existing version of itself
It was a good idea, but the file is still in conflict, I will write to
studio@boardgamearena.com
Thanks
