Upgrading Traccar version with local changes

ssan 8 years ago

Hi,
I have made local changes on top of the Traccar version 3.13. Now I want to upgrade to 3.14 and then apply local changes. I believe only manual merge is the possibility but still checking is there any easier way to upgrade and apply local changes?

Anton Tananaev 8 years ago

If you are using git, you should be able to merge code automatically, unless there are some conflicts.