我迄今为止并没有涉及过太多Git。现在,我遇到了以下问题。 当我做了一些本地修改和提交后,我的同事在一个新分支中对文件和文件夹进行了重构。然后,我添加了一个远程跟踪分支(反映他的更改),并尝试将我的修改合并到其中。当然,它会失败,因为文件移动到另一个位置。我该怎么继续下去? 通过'git status'命令可以看到以下内容:
# On branch develop
# You have unmerged paths.
# (fix conflicts and run "git commit")
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by us: src/de/mpicbg/tds/knime/hcstools/prefs/DoubleFieldEditor.java
# deleted by us: src/de/mpicbg/tds/knime/hcstools/prefs/HCSToolsPreferencePage.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/HeatMapModel.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/PlateViewer.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/color/LinearGradientTools.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/dialog/PlateAttributeDialog.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/menu/TrellisMenu.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/menu/ViewMenu.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/menu/WellAttributeComboBox.java
# deleted by us: src/de/mpicbg/tds/knime/heatmap/renderer/HeatTrellis.java
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# bin/
# src/de/mpicbg/tds/knime/heatmap/HeatMapModel.ucls
# src/de/mpicbg/tds/knime/heatmap/diagram.ucls
no changes added to commit (use "git add" and/or "git commit -a")
我现在不知道该怎么办...