[#IDEABKL-3758] Add option to turn off merging of files updated with conflicts

IDEA: Backlog

Add option to turn off merging of files updated with conflicts

Created: 14 Aug 06 19:53 Updated: 15 Sep 06 19:28

Component/s:

Version Control Integration. Perforce

Affects Version/s:

None

Fix Version/s:

None

Original Estimate:	Unknown	Remaining Estimate:	Unknown	Time Spent:	Unknown
Environment:	Windows XP SP2

Build:	5,594
Severity:	Medium

Description

« Hide

When I run a "Update Project", I uncheck the "Run resolve automatically after the sync" checkbox but it runs resolve anyway after the sync if there are conflicts. I don't want to resolve within IDEA at this point. I just want the files that have conflicts to be pointed out.

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Dmitry Jemerov - 13 Sep 06 17:48

The existing option actually works. It controls only one thing: whether automatic resolve (p4 resolve -am) is run after the sync. It's possible to add a new option to turn off IDEA's merge, but that would be a new feature, not a bug.