These are chat archives for ushahidi/Community

8th
Aug 2018
Arturo
@ArturoQuintana
Aug 08 2018 12:40

Hi David Losada @tuxpiper
we are trying to update our ushahidi instance, but we are having some issues
when we try to update the client, we get this:

error: Your local changes to 'app/common/services/maps.js' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.

what should we do?

Arturo
@ArturoQuintana
Aug 08 2018 12:51

Hi @tuxpiper, @ushbot , @aoduor
we are trying to update our ushahidi instance, but we are having some issues
when we try to update the client, we get this:

error: Your local changes to 'app/common/services/maps.js' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.

what should we do?

Another thing is that once we have updated the platform, we can not reach the client. It asks for a password all the time.

Arturo
@ArturoQuintana
Aug 08 2018 12:56
@tuxpiper, @ushbot , @aoduor we are sure that we have to update the client too, but the thing is with those changes on our side
Ushbot
@ushbot
Aug 08 2018 13:28
[David Losada, Ushahidi] hi Arturo, it looks like both you and us have made changes to that file. In order to update, the changes would have to be reconcileed
[David Losada, Ushahidi] “git stash” would temporarily move your changes to the side .. and “git pull” should work after that in order to pull our changes. “git stash pop” would re-apply your changes. If you re lucky, there will be no conflicts and everything may work.
Arturo
@ArturoQuintana
Aug 08 2018 13:46
thanks @tuxpiper David
I did it, and I had this errors after apply git stash pop
Auto-merging app/common/services/maps.js
CONFLICT (content): Merge conflict in app/common/services/maps.js
Auto-merging app/main/activity/activity-timeline.html
CONFLICT (content): Merge conflict in app/main/activity/activity-timeline.html
Auto-merging app/main/posts/common/post-metadata.html
CONFLICT (content): Merge conflict in app/main/posts/common/post-metadata.html
Auto-merging app/main/posts/detail/post-messages.html
CONFLICT (content): Merge conflict in app/main/posts/detail/post-messages.html
Auto-merging app/main/posts/modify/post-toolbox.html
CONFLICT (content): Merge conflict in app/main/posts/modify/post-toolbox.html
Ushbot
@ushbot
Aug 08 2018 13:55
[David Losada, Ushahidi] sorry, it looks like manual reconciliation of all those changes is needed
Arturo
@ArturoQuintana
Aug 08 2018 13:55
But we did not change any of those files.
Ushbot
@ushbot
Aug 08 2018 14:07
[David Losada, Ushahidi] in that case, you can ignore the errors and reset to the latest of the branch you pulled : “git reset --hard origin/<branch name>”
[David Losada, Ushahidi] it’s a bit strange though, that you got those conflicts without changing anything
Arturo
@ArturoQuintana
Aug 08 2018 15:46
Thanks David @tuxpiper
but I will try to do it later. For some reason the system has gone down, and we need it operational.