Loading

Paste #pwrrbfwve

  1. First, rewinding head to replay your work on top of it...
  2. Applying: Feature: Add NotRoadTypes (NRT)
  3. Using index info to reconstruct a base tree...
  4. M   docs/landscape.html
  5. M   docs/landscape_grid.html
  6. M   media/extra_grf/openttdgui.png
  7. A   projects/openttd_vs100.vcxproj
  8. A   projects/openttd_vs100.vcxproj.filters
  9. M   projects/openttd_vs140.vcxproj
  10. M   projects/openttd_vs140.vcxproj.filters
  11. A   projects/openttd_vs80.vcproj
  12. A   projects/openttd_vs90.vcproj
  13. M   source.list
  14. M   src/autoreplace_cmd.cpp
  15. M   src/autoreplace_gui.cpp
  16. M   src/bridge_gui.cpp
  17. M   src/bridge_map.h
  18. M   src/command.cpp
  19. M   src/company_base.h
  20. M   src/company_cmd.cpp
  21. M   src/company_gui.cpp
  22. M   src/economy.cpp
  23. M   src/engine.cpp
  24. M   src/ground_vehicle.cpp
  25. M   src/lang/afrikaans.txt
  26. M   src/lang/arabic_egypt.txt
  27. M   src/lang/basque.txt
  28. M   src/lang/belarusian.txt
  29. M   src/lang/brazilian_portuguese.txt
  30. M   src/lang/bulgarian.txt
  31. M   src/lang/catalan.txt
  32. M   src/lang/croatian.txt
  33. M   src/lang/czech.txt
  34. M   src/lang/danish.txt
  35. M   src/lang/dutch.txt
  36. M   src/lang/english.txt
  37. M   src/lang/english_AU.txt
  38. M   src/lang/english_US.txt
  39. M   src/lang/esperanto.txt
  40. M   src/lang/estonian.txt
  41. M   src/lang/faroese.txt
  42. M   src/lang/finnish.txt
  43. M   src/lang/french.txt
  44. M   src/lang/gaelic.txt
  45. M   src/lang/galician.txt
  46. M   src/lang/german.txt
  47. M   src/lang/greek.txt
  48. M   src/lang/hebrew.txt
  49. M   src/lang/hungarian.txt
  50. M   src/lang/icelandic.txt
  51. M   src/lang/indonesian.txt
  52. M   src/lang/irish.txt
  53. M   src/lang/italian.txt
  54. M   src/lang/japanese.txt
  55. M   src/lang/korean.txt
  56. M   src/lang/latin.txt
  57. M   src/lang/latvian.txt
  58. M   src/lang/lithuanian.txt
  59. M   src/lang/luxembourgish.txt
  60. M   src/lang/malay.txt
  61. M   src/lang/norwegian_bokmal.txt
  62. M   src/lang/norwegian_nynorsk.txt
  63. M   src/lang/polish.txt
  64. M   src/lang/portuguese.txt
  65. M   src/lang/romanian.txt
  66. M   src/lang/russian.txt
  67. M   src/lang/serbian.txt
  68. M   src/lang/simplified_chinese.txt
  69. M   src/lang/slovak.txt
  70. M   src/lang/slovenian.txt
  71. M   src/lang/spanish.txt
  72. M   src/lang/spanish_MX.txt
  73. M   src/lang/swedish.txt
  74. M   src/lang/tamil.txt
  75. M   src/lang/thai.txt
  76. M   src/lang/traditional_chinese.txt
  77. M   src/lang/turkish.txt
  78. M   src/lang/ukrainian.txt
  79. M   src/lang/unfinished/frisian.txt
  80. M   src/lang/unfinished/macedonian.txt
  81. M   src/lang/unfinished/persian.txt
  82. M   src/lang/unfinished/urdu.txt
  83. M   src/lang/vietnamese.txt
  84. M   src/lang/welsh.txt
  85. M   src/misc_gui.cpp
  86. M   src/newgrf.cpp
  87. M   src/openttd.cpp
  88. M   src/pathfinder/follow_track.hpp
  89. M   src/pathfinder/npf/npf.cpp
  90. M   src/pathfinder/yapf/yapf_costrail.hpp
  91. M   src/pathfinder/yapf/yapf_road.cpp
  92. M   src/rail_cmd.cpp
  93. M   src/rail_gui.cpp
  94. M   src/road_cmd.cpp
  95. M   src/road_func.h
  96. M   src/road_map.h
  97. M   src/roadveh_cmd.cpp
  98. M   src/saveload/afterload.cpp
  99. M   src/saveload/company_sl.cpp
  100. M   src/saveload/saveload.cpp
  101. M   src/script/api/ai_changelog.hpp
  102. M   src/script/api/game/game_window.hpp.sq
  103. M   src/script/api/game_changelog.hpp
  104. M   src/script/api/script_window.hpp
  105. M   src/smallmap_gui.cpp
  106. M   src/station_cmd.cpp
  107. M   src/station_map.h
  108. M   src/table/newgrf_debug_data.h
  109. M   src/toolbar_gui.cpp
  110. M   src/town_cmd.cpp
  111. M   src/tunnel_map.h
  112. M   src/tunnelbridge_cmd.cpp
  113. M   src/vehicle.cpp
  114. Falling back to patching base and 3-way merge...
  115. Auto-merging src/vehicle.cpp
  116. Auto-merging src/tunnelbridge_cmd.cpp
  117. CONFLICT (content): Merge conflict in src/tunnelbridge_cmd.cpp
  118. Auto-merging src/tunnel_map.h
  119. Auto-merging src/town_cmd.cpp
  120. Auto-merging src/toolbar_gui.cpp
  121. CONFLICT (content): Merge conflict in src/toolbar_gui.cpp
  122. Auto-merging src/table/newgrf_debug_data.h
  123. Auto-merging src/station_map.h
  124. Auto-merging src/station_cmd.cpp
  125. Auto-merging src/smallmap_gui.cpp
  126. Auto-merging src/script/api/script_window.hpp
  127. Auto-merging src/script/api/game_changelog.hpp
  128. Auto-merging src/script/api/game/game_window.hpp.sq
  129. Auto-merging src/script/api/ai_changelog.hpp
  130. Auto-merging src/saveload/saveload.cpp
  131. CONFLICT (content): Merge conflict in src/saveload/saveload.cpp
  132. Auto-merging src/saveload/company_sl.cpp
  133. Auto-merging src/saveload/afterload.cpp
  134. CONFLICT (content): Merge conflict in src/saveload/afterload.cpp
  135. Auto-merging src/roadveh_cmd.cpp
  136. Auto-merging src/road_map.h
  137. CONFLICT (content): Merge conflict in src/road_map.h
  138. Auto-merging src/road_func.h
  139. Auto-merging src/road_cmd.cpp
  140. Auto-merging src/rail_gui.cpp
  141. Auto-merging src/rail_cmd.cpp
  142. Auto-merging src/pathfinder/yapf/yapf_road.cpp
  143. CONFLICT (content): Merge conflict in src/pathfinder/yapf/yapf_road.cpp
  144. Auto-merging src/pathfinder/yapf/yapf_costrail.hpp
  145. Auto-merging src/pathfinder/npf/npf.cpp
  146. CONFLICT (content): Merge conflict in src/pathfinder/npf/npf.cpp
  147. Auto-merging src/pathfinder/follow_track.hpp
  148. CONFLICT (content): Merge conflict in src/pathfinder/follow_track.hpp
  149. Auto-merging src/openttd.cpp
  150. Auto-merging src/newgrf.cpp
  151. Auto-merging src/misc_gui.cpp
  152. Auto-merging src/lang/welsh.txt
  153. Auto-merging src/lang/vietnamese.txt
  154. Auto-merging src/lang/unfinished/urdu.txt
  155. Auto-merging src/lang/unfinished/persian.txt
  156. Auto-merging src/lang/unfinished/macedonian.txt
  157. Auto-merging src/lang/unfinished/frisian.txt
  158. Auto-merging src/lang/ukrainian.txt
  159. Auto-merging src/lang/turkish.txt
  160. Auto-merging src/lang/traditional_chinese.txt
  161. Auto-merging src/lang/thai.txt
  162. Auto-merging src/lang/tamil.txt
  163. Auto-merging src/lang/swedish.txt
  164. Auto-merging src/lang/spanish_MX.txt
  165. Auto-merging src/lang/spanish.txt
  166. Auto-merging src/lang/slovenian.txt
  167. Auto-merging src/lang/slovak.txt
  168. Auto-merging src/lang/simplified_chinese.txt
  169. Auto-merging src/lang/serbian.txt
  170. Auto-merging src/lang/russian.txt
  171. Auto-merging src/lang/romanian.txt
  172. Auto-merging src/lang/portuguese.txt
  173. Auto-merging src/lang/polish.txt
  174. Auto-merging src/lang/norwegian_nynorsk.txt
  175. Auto-merging src/lang/norwegian_bokmal.txt
  176. Auto-merging src/lang/malay.txt
  177. Auto-merging src/lang/luxembourgish.txt
  178. Auto-merging src/lang/lithuanian.txt
  179. Auto-merging src/lang/latvian.txt
  180. Auto-merging src/lang/latin.txt
  181. Auto-merging src/lang/korean.txt
  182. Auto-merging src/lang/japanese.txt
  183. Auto-merging src/lang/italian.txt
  184. Auto-merging src/lang/irish.txt
  185. Auto-merging src/lang/indonesian.txt
  186. CONFLICT (content): Merge conflict in src/lang/indonesian.txt
  187. Auto-merging src/lang/icelandic.txt
  188. Auto-merging src/lang/hungarian.txt
  189. Auto-merging src/lang/hebrew.txt
  190. Auto-merging src/lang/greek.txt
  191. Auto-merging src/lang/german.txt
  192. Auto-merging src/lang/galician.txt
  193. Auto-merging src/lang/gaelic.txt
  194. Auto-merging src/lang/french.txt
  195. Auto-merging src/lang/finnish.txt
  196. Auto-merging src/lang/faroese.txt
  197. Auto-merging src/lang/estonian.txt
  198. Auto-merging src/lang/esperanto.txt
  199. Auto-merging src/lang/english_US.txt
  200. Auto-merging src/lang/english_AU.txt
  201. Auto-merging src/lang/english.txt
  202. Auto-merging src/lang/dutch.txt
  203. Auto-merging src/lang/danish.txt
  204. Auto-merging src/lang/czech.txt
  205. Auto-merging src/lang/croatian.txt
  206. Auto-merging src/lang/catalan.txt
  207. Auto-merging src/lang/bulgarian.txt
  208. Auto-merging src/lang/brazilian_portuguese.txt
  209. CONFLICT (content): Merge conflict in src/lang/brazilian_portuguese.txt
  210. Auto-merging src/lang/belarusian.txt
  211. Auto-merging src/lang/basque.txt
  212. Auto-merging src/lang/arabic_egypt.txt
  213. Auto-merging src/lang/afrikaans.txt
  214. Auto-merging src/ground_vehicle.cpp
  215. Auto-merging src/engine.cpp
  216. Auto-merging src/economy.cpp
  217. Auto-merging src/company_gui.cpp
  218. Auto-merging src/company_cmd.cpp
  219. Auto-merging src/company_base.h
  220. Auto-merging src/command.cpp
  221. Auto-merging src/bridge_map.h
  222. CONFLICT (content): Merge conflict in src/bridge_map.h
  223. Auto-merging src/bridge_gui.cpp
  224. Auto-merging src/autoreplace_gui.cpp
  225. Auto-merging src/autoreplace_cmd.cpp
  226. Auto-merging source.list
  227. CONFLICT (modify/delete): projects/openttd_vs90.vcproj deleted in HEAD and modified in Feature: Add NotRoadTypes (NRT). Version Feature: Add NotRoadTypes (NRT) of projects/openttd_vs90.vcproj left in tree.
  228. CONFLICT (modify/delete): projects/openttd_vs80.vcproj deleted in HEAD and modified in Feature: Add NotRoadTypes (NRT). Version Feature: Add NotRoadTypes (NRT) of projects/openttd_vs80.vcproj left in tree.
  229. Auto-merging projects/openttd_vs141.vcxproj.filters
  230. Auto-merging projects/openttd_vs141.vcxproj
  231. Auto-merging projects/openttd_vs140.vcxproj.filters
  232. Auto-merging projects/openttd_vs140.vcxproj
  233. Auto-merging media/extra_grf/openttdgui.png
  234. CONFLICT (content): Merge conflict in media/extra_grf/openttdgui.png
  235. Auto-merging docs/landscape_grid.html
  236. CONFLICT (content): Merge conflict in docs/landscape_grid.html
  237. Auto-merging docs/landscape.html
  238. CONFLICT (content): Merge conflict in docs/landscape.html
  239. Patch failed at 0001 Feature: Add NotRoadTypes (NRT)
  240. Use 'git am --show-current-patch' to see the failed patch
  241.  
  242. Resolve all conflicts manually, mark them as resolved with
  243. "git add/rm <conflicted_files>", then run "git rebase --continue".
  244. You can instead skip this commit: run "git rebase --skip".
  245. To abort and get back to the state before "git rebase", run "git rebase --abort".

Comments