Discussion

Comment from stjur on 3 April 2019 at 22:48

I think you can just select all conflicts by clicking on one and then pressing CTRL A. Then you can solve them at once by right-clicking and either solving them all to your version or to “their’s”.

Comment from Infrarrojo on 4 April 2019 at 00:36

As an update: It’s not rendered yet, but it looks like in function it is fixed, as I checked the old area and it is empty. Because of this you should be able to expect the rendering issues to all sort themselves out now.

Best Wishes, Infrarrojo

Leave a comment

Log in to leave a comment