【git】ファイルがマージされていないためプルできません
Git Pull Is Not Possible Because You Have Unmerged Files
In the process of git pull, if there is a conflict, in addition to the conflicting files, other files will be saved as files in the staged area. Reproduce: $ git pull A Applications/Commerce/BookingAnalysis.java A Applications/Commerce/ClickSummaryFormatter.java M Applications/CommerceForecasting/forecast/Forecast.java A Applications/CommerceForecasting/forecast/ForecastCurveProviderCategory.java M Applications/CommerceForecasting/forecast/ForecastProvider.java M Applications/CommerceForecasting/forecast/InputPropertyItem.java ...... A Applications/LocalezeImporter/com/tripadvisor/feeds/SingleMenuLocalezeMatcher.java A Applications/LocalezeImporter/com/tripadvisor/feeds/TypeCategory.java Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution, or use 'git commit -a'. https://blog.csdn.net/zxsted/article/details/17022665
https://blog.51cto.com/halolk/1304701