Xavier Morel a69ed7996a [FIX] forwardport: change method for conflicting working copy ... The original method was to `git diff | git apply` in order to get a complete overview of conflicts generated by the forward port (if any). However this turns out to have a huge issue in the presence of renamed or removed files: in that case `git apply` will simply not do anything, and fail with a completely clean working copy. Which is very much undesirable. -> alternative method, squash the PR to a single commit then cherry-pick that single commit, this should provide us with proper conflicts & their markers. Also add tests for conflicts due to deleted files...		2019-09-12 09:05:49 +02:00
..
__init__.py	[ADD] forwardbot	2019-09-05 10:00:07 +02:00
forwardport.py	[ADD] forwardbot	2019-09-05 10:00:07 +02:00
project.py	[FIX] forwardport: change method for conflicting working copy	2019-09-12 09:05:49 +02:00