How to resolve git conflict when upgrading passbolt?

Installation Issues
1

Good morning,
i have a problem upgrading passbolt.

my version is 1.4.0 and i want to follow the upgrade procedure on passbolt website about minor version

i used this command
$ git fetch
$ git checkout tags/v1.6.5

here the output of command git checkout

root@passbolt:/var/www/passbolt# git checkout tags/v1.6.5
error: Your local changes to the following files would be overwritten by checkout:
app/Config/email.php
app/tmp/swagger/info.php
Please, commit your changes or stash them before you can switch branches.
Aborting

how can i solve this problem?

Thanks a lot for an answer

2

Hi @fabrix71,

Have a look at your email config, make sure you note down the details
Do:

$ git stash
$ git fetch
$ git checkout tags/v1.6.5

Then create/update the email.php file again with the previous details.

3

Good morning remy and have a good 2018!!!
I have done the update and it seems work well. I have done the migration script.

One another questione:

in my healthchek page there is a warning:
The temporary directory and its content are not writable

It’s normal ?

4

Hi @fabrix71 no that’s not normal. You should make sure the tmp directory is writable to the web server user.
For example:

sudo chmod 770 -R app/tmp/
5

Perfect!!! now health check is “full green”!!!