我正在开发一个flutter应用程序，使用bitbucket作为版本控制。以下是.gitignore文件：
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/
# IntelliJ related
*.iml
*.ipr
*.iws
.idea/
# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/
# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
/build/
# Web related
lib/generated_plugin_registrant.dart
# Symbolication related
app.*.symbols
# Obfuscation related
app.*.map.json
# Android Studio will place build artifacts here
/android/app/debug
/android/app/profile
/android/app/release
我先执行git add *，然后执行git commit -m "message"来进行提交。多么不幸的是，.gitignore文件从未被提交。
当我尝试执行git pull或git pull --rebase时，我得到以下错误
Updating 200df3e..02afe50
error: The following untracked working tree files would be overwritten by merge:
.gitignore
.metadata
Please move or remove them before you merge.
Aborting
浏览互联网时，问题似乎是.gitignore文件和metadata未被提交。所以拉力无法将它们合并。
如何确保这些文件已提交？
更新
我按照用户ti7的回答，在命令git stash pop之后，我得到了以下消息。这是什么意思？
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: ios/Flutter/Debug.xcconfig
modified: ios/Flutter/Release.xcconfig
Untracked files:
(use "git add <file>..." to include in what will be committed)
ios/Podfile
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (799d2e53c1509af435d5d4d589a0ded18d3aad64)
这些文件可能不存在于您的工作树中，但确实存在于远程上
- 显式添加文件
git add .gitignore .metadata - 藏起来
git stash - 则合并
git pull - 不稳定
git stash pop
git add *的问题是*由您的shell扩展，但不包括.dotfiles