On 24 Nov 2013, at 21:46, Juraj Kubelka <[email protected]> wrote:
> The slice
> SLICE-Issue-12179-Nautilus-Add-package-filter-input-box-JurajKubelka.3
> already contains the fix. But whenever I try to merge with the image 30593,
> it says merge conflict.
> The solution is to say "Use incoming version”. I do not know how to do it
> better.
As soon as an issue is integrated, it is better to submit a new change (new
issue) based on the new
image.
Much easier to handle.
Marcus
