Modify ↓

Opened 4 years ago

Closed 4 years ago

Last modified 4 years ago

#3103 closed defect (fixed)

resolve conflicts after combining just one conflict

Reported by: dieterdreist Owned by: team
Priority: major Component: Core
Version: latest Keywords: resolve conflicts
Cc:

Description

The popup resolve conflicts after combining 2 ways displays just one conflict to resolve. All others are merged without explicit confirmation (e.g. tags that are just on one way)

Attachments (0)

Change History (3)

comment:1 Changed 4 years ago by stoecker

  • Resolution set to duplicate
  • Status changed from new to closed

comment:2 Changed 4 years ago by stoecker

Closed as duplicate of #3556.

comment:3 Changed 4 years ago by Gubaer

  • Resolution changed from duplicate to fixed

(In [2220]) fixed #3556: False positive conflicts when merging nodes
fixed #3460: show only conflicting tags at conflict resolution dialog
fixed #3103: resolve conflicts after combining just one conflict

Add Comment

Modify Ticket

Change Properties
<Author field>
Action
as closed .
as The resolution will be set. Next status will be 'closed'.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

Attachments ↑ Description ↑
 
Note: See TracTickets for help on using tickets.