Modify ↓

Opened 15 years ago

Closed 15 years ago

Last modified 15 years ago

#3103 closed defect (fixed)

resolve conflicts after combining just one conflict

Reported by: dieterdreist Owned by: team
Priority: major Milestone:
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 by stoecker, 15 years ago

Resolution: → duplicate
Status: new → closed

comment:2 by stoecker, 15 years ago

Closed as duplicate of #3556.

comment:3 by Gubaer, 15 years ago

Resolution: duplicate → 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

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment
E-mail address and name can be saved in the Preferences .
Attachments ↑ Description ↑
 
Note: See TracTickets for help on using tickets.