problem
In the updated code, I follow the previous operating point, VCS menu under Update Project, the results being given, idea automatically all the code I have not submitted a stash of Tibet, all the code to restore the heart to panic a bit go GitLab point of view a bit and found a "bad son" was actually the .iml file (intellij idea of the project profile) to be uploaded to a remote repository, I have .iml local file but again not submitted, so there are conflicts a.
solution:
Eventually I was first rollback in Local History is not in the Stash of the previous version, then View .iml files in the Files deleted in the local and then update it. Of course, the right solution is the Stash, and then update the code, then the code UnStash come together.