Hi, thank you for your attention
here listing of my console
git stash pop
Autolink lib / tasks / gitlab / check.rake
CONFLICT (content): Conflict in lib / tasks / gitlab / check.rake
CONFLICT (change / delete): config / resque.yml.example is removed in Stashed changes and changed to Updated upstream. The updated upstream version of config / resque.yml.example is left in the tree.
CONFLICT (change / delete): config / gitlab.yml.example is removed in Stashed changes and changed to Updated upstream. Updated upstream version of config / gitlab.yml.example is left in the tree.
Auto config / environments / production.rb
CONFLICT (change / delete): config / database.yml.postgresql is removed in Stashed changes and changed to Updated upstream. The updated upstream version of config / database.yml.postgresql is left in the tree.
Auto-app app / helpers / commits_helper.rb
CONFLICT (content): The merge conflict in app / helpers / commits_helper.rb
Auto-Gemfile
CONFLICT (content): Conflict in Gemfile
Warning: inexact rename detection was skipped due to too many files.
Warning: you may want to set your merge.renamelimit to 7336 and retry the command.
what can i do in this situation?