IntelliJ IDEA Help: Comparing Files (Diff)

锟斤拷锟斤拷(Diff) 锟斤拷

IDEA 锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟较憋拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟街达拷锟斤拷锟斤拷锟斤拷锟斤拷(diff)锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟街达拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷腋锟� 锟斤拷锟斤拷习锟�, 锟斤拷锟斤拷锟斤拷锟饺匡拷锟斤拷锟斤拷锟较匡拷锟斤拷农锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷:

锟斤拷锟酵革拷 锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷 锟斤拷锟斤拷锟戒府 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷锟� 锟斤拷锟斤拷 锟斤拷锟斤拷 锟斤拷锟斤拷锟斤拷锟戒府 锟斤拷锟斤拷 local file锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷锟筋恫 local file 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较帮拷锟斤拷锟较绞矫匡拷

锟筋恫 2锟斤拷锟斤拷 local file 锟斤拷锟斤拷锟斤拷锟斤拷锟较绞矫匡拷: text 锟角达拷 binary

锟斤拷锟斤拷锟斤拷锟斤拷 selected text锟斤拷 努锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷飘 锟斤拷锟斤拷锟较绞矫匡拷

class/class member锟斤拷 class/class member 锟斤拷锟斤拷锟较绞矫匡拷.

Difference Viewer UI

锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟较达拷锟斤拷锟斤拷鸥锟皆匡拷锟斤拷锟斤拷锟斤拷锟�, Difference Viewer 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟皆聪达拷.

锟斤拷锟斤拷 锟斤拷锟斤拷锟戒府 锟斤拷锟斤拷锟斤拷锟较猴拷锟今背达拷锟筋恫锟轿帮拷锟斤拷锟斤拷锟斤拷锟斤拷锟解夯锟斤拷羁� 锟竭帮拷锟斤拷锟斤拷锟斤拷锟金辅聪达拷.

锟阶凤拷锟斤拷锟教达拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟饺匡拷锟斤拷锟皆邓聪达拷. 锟斤拷锟斤拷锟阶革拷锟斤拷 Difference Viewer 锟斤拷锟街匡拷锟轿猴拷锟斤拷锟斤拷锟斤拷锟秸聪达拷:

Difference Viewer Toolbar:

Icon	Function	Description
	Copy	锟斤拷锟矫碉拷锟截斤拷飘锟斤拷锟斤拷锟桔匡拷墨锟斤拷锟秸聪达拷
	Find	锟截斤拷飘茫锟斤拷锟斤拷锟教撅拷伪赘锟� 锟轿革拷锟较达拷.
	Move to the previous difference	锟斤拷锟斤拷锟筋恫锟斤拷锟教讹拷锟竭斑登帮拷某锟斤拷锟斤拷霉锟斤拷掳锟斤拷锟斤拷(锟斤拷瓢锟斤拷锟斤拷锟� 锟斤拷锟斤拷)锟斤拷锟斤拷锟斤拷锟斤拷, 锟阶帮拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街达拷锟酵匡拷锟秸硷拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷某锟斤拷锟斤拷锟斤拷锟� 锟脚憋拷洗锟�.
	Move to the next difference	锟斤拷锟斤拷锟筋恫锟斤拷锟教帮拷锟竭斑登帮拷, 某锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷(锟斤拷, 锟斤拷瓢锟斤拷锟斤拷锟� 锟斤拷锟斤拷)锟斤拷锟斤拷锟斤拷锟斤拷, 某锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街达拷锟斤拷锟侥匡拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟脚憋拷洗锟�.
	Ignore Whitespace	锟今背帮拷锟今背碉拷锟斤拷锟斤拷锟斤拷锟教匡拷锟斤拷锟斤拷锟介俊锟街达拷锟斤拷锟教革拷钎锟斤拷锟截具革拷锟较达拷锟斤拷锟斤拷锟斤拷锟斤拷锟秸聪达拷. Do not ignore: 锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟教帮拷锟斤拷锟斤拷锟斤拷锟较达拷 Leading and Trailing: 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟教诧拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟轿硷拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷鸥锟斤拷锟较达拷 All: 锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟教达拷锟斤拷锟矫邓聪达拷

Text Views
锟斤拷锟斤拷锟斤拷锟斤拷锟今背碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷钎锟斤拷锟较达拷 2锟斤拷锟斤拷锟叫筹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较达拷:

锟斤拷锟斤拷锟斤拷锟斤拷锟叫筹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷钎锟斤拷锟秸聪达拷

锟斤拷锟斤拷锟斤拷锟叫筹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较匡拷锟今背碉拷锟斤拷锟斤拷锟斤拷锟皆聪达拷.

锟斤拷锟斤拷锟斤拷锟矫碉拷锟截斤拷飘锟斤拷努锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟较革拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞帮拷锟斤拷锟斤拷锟斤拷锟斤拷努锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷鸥锟斤拷锟较达拷.
锟斤拷锟斤拷锟� 锟斤拷锟较帮拷锟街达拷锟酵匡拷锟斤拷锟斤拷锟斤拷锟绞帮拷锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷锟教猴拷锟斤拷锟斤拷锟劫撅拷锟秸聪达拷.

锟斤拷锟斤拷锟斤拷锟�, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟戒府锟斤拷锟斤拷锟较革拷, 锟斤拷锟斤拷锟� 锟斤拷锟矫碉拷锟截斤拷飘锟斤拷努锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟较达拷锟酵猴拷锟斤拷锟劫革拷锟斤拷锟斤拷锟教猴拷锟剿聪达拷.

锟较猴拷锟斤拷锟斤拷(锟斤拷锟斤拷锟斤拷锟斤拷锟戒府锟角达拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟教讹拷)锟斤拷锟斤拷锟较匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷,

锟斤拷锟斤拷 锟斤拷锟斤拷(锟斤拷锟揭斤拷)锟斤拷 锟叫憋拷 锟斤拷锟斤拷锟教帮拷 锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷(锟斤拷锟斤拷锟斤拷锟斤拷)锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷. 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟铰匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷腔锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟较凤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 钎锟斤拷锟较达拷 锟斤拷目 锟斤拷锟斤拷锟斤拷锟斤拷锟较达拷 Editor锟斤拷锟斤拷锟皆聪达拷.

锟斤拷锟斤拷锟斤拷羁★拷锟�, 锟斤拷目锟劫碉拷 difference markers (锟斤拷锟斤拷 锟阶革拷锟斤拷锟狡凤拷锟斤拷锟斤拷锟斤拷)锟斤拷钎锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷目锟斤拷努锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟� 锟斤拷目锟斤拷锟斤拷锟斤拷钎锟矫碉拷锟斤拷锟教匡拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟斤拷目锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷鸥锟斤拷锟较达拷. 锟阶革拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟阶碉拷锟斤拷锟斤拷锟教革拷锟阶猴拷锟斤拷锟狡拷媳锟� 锟斤拷锟斤拷锟教匡拷锟斤拷锟斤拷锟街斤拷锟较达拷.

Apply Change 锟斤拷锟斤拷锟斤拷:
锟斤拷锟教帮拷锟斤拷锟桔登达拷锟斤拷锟斤拷锟斤拷锟斤拷权锟诫俊锟斤拷鸥锟斤拷锟较达拷. 锟斤拷锟斤拷(锟斤拷锟斤拷, 锟斤拷锟斤拷, 锟斤拷锟斤拷)锟斤拷鸥锟皆匡拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷虐锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷努锟斤拷锟较达拷锟斤拷锟斤拷

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟皆聪达拷:

鸥锟斤拷锟斤拷锟较凤拷锟斤拷锟教革拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟皆诧拷钎锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷眉锟较绞矫匡拷

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷虐锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟竭伙拷锟秸聪达拷.
Remove 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟劫革拷锟斤拷锟较匡拷锟斤拷锟斤拷锟皆碉拷锟筋恫锟斤拷业锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟街达拷锟斤拷锟斤拷锟斤拷权锟诫俊锟斤拷锟斤拷鸥锟斤拷锟较达拷.

Status Legend:

锟斤拷锟斤拷锟斤拷锟� 锟狡凤拷锟斤拷锟斤拷锟劫达拷锟竭斑碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟角达拷锟矫凤拷锟斤拷糯锟斤拷锟斤拷锟斤拷锟街帮拷锟街达拷锟斤拷锟斤拷锟斤拷墨锟斤拷飘锟斤拷锟竭斑碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟铰革拷钎锟斤拷锟较达拷锟斤拷锟斤拷锟斤拷锟斤拷锟捷聪达拷.

锟斤拷锟斤拷锟斤拷目锟斤拷锟截斤拷飘锟斤拷锟斤拷锟教帮拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟教筹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟剿聪达拷. 锟斤拷锟斤拷 锟阶革拷锟斤拷锟斤拷锟斤拷锟阶碉拷锟斤拷锟角固革拷钎锟斤拷锟秸聪达拷.

锟斤拷(diff) 锟斤拷锟桔凤拷锟教硷拷

锟斤拷锟斤拷锟斤拷锟斤拷 IDEA锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟街达拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟疥俊锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷鸥锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟角帮拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟较革拷锟斤拷锟矫碉拷锟斤拷锟斤拷锟斤拷锟饺匡拷锟斤拷锟斤拷锟教伙拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷蔷锟斤拷锟斤拷洗锟�.

Comparing directories:

锟斤拷锟斤拷锟� Local History 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较匡拷锟斤拷眉锟斤拷锟酵革拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟斤拷锟� 锟斤拷锟� 锟街憋拷锟斤拷劝锟斤拷锟角达拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷. 锟斤拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷 锟斤拷锟斤拷锟戒府: 锟斤拷锟酵革拷 锟斤拷锟斤拷锟戒府 锟斤拷锟斤拷锟绞矫匡拷.
IDEA锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟酵革拷锟斤拷锟今背革拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞斤拷锟较达拷. 锟阶凤拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟阶帮拷锟斤拷锟较达拷锟斤拷瓶锟斤拷萍锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷,

锟斤拷锟斤拷锟� 锟缴硷拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟较匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟街帮拷, 锟斤拷锟斤拷锟斤拷锟阶帮拷锟斤拷 IDEA 锟饺匡拷锟斤拷锟斤拷锟酵革拷锟斤拷锟斤拷锟较憋拷锟斤拷锟斤拷龋锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟斤拷锟� 锟杰猴拷 diff 锟斤拷锟斤拷锟斤拷锟铰撅拷锟较憋拷锟斤拷锟截硷拷:

锟斤拷锟睫达拷锟斤拷锟斤拷 File | Settings: IDE: General: Diff options锟斤拷锟斤拷锟斤拷锟较绞矫匡拷.

Use external tool to compare folders锟节斤拷锟斤拷眉农锟较绞矫匡拷.

锟阶帮拷锟狡凤拷锟斤拷 ellipsis 锟斤拷瓢锟斤拷努锟斤拷锟较帮拷, 锟杰猴拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较匡拷锟斤拷胃锟� 锟斤拷锟斤拷锟秸聪达拷.

OK锟斤拷锟斤拷锟斤拷锟斤拷锟教撅拷伪赘锟� 锟捷憋拷锟斤拷锟斤拷 OK努锟斤拷锟较绞矫匡拷.

锟斤拷锟斤拷锟� 锟杰猴拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥匡拷:

锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟解甫锟斤拷锟斤拷锟秸聪达拷.

锟杰猴拷 diff 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷峡锟� 锟斤拷锟斤拷锟� 锟斤拷锟较扁甫锟斤拷锟较达拷 2锟斤拷锟斤拷锟斤拷锟酵革拷锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟睫达拷锟斤拷龋锟斤拷锟较帮拷, Compare two directories锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟杰猴拷 diff 锟斤拷锟斤拷锟斤拷锟斤拷锟矫碉拷锟斤拷锟酵革拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟教帮拷, 锟斤拷锟斤拷锟斤拷锟皆聪达拷.

CVS 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷目锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟桔凤拷锟教记帮拷锟斤拷锟斤拷锟较匡拷锟斤拷锟矫帮拷锟斤拷锟斤拷锟斤拷锟酵革拷锟斤拷锟斤拷锟斤拷锟解甫锟斤拷锟斤拷锟秸聪达拷.

锟阶帮拷锟斤拷锟斤拷锟解俊锟斤拷锟斤拷锟斤拷锟� "diff" 锟斤拷砂锟� 锟斤拷锟斤拷锟绞斤拷锟较达拷.

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 Version Control: CVS Integration: Project-specific Operations: Commit锟斤拷锟斤拷锟绞矫匡拷.

Comparing a local file to a Local History version:

锟斤拷锟斤拷 锟斤拷锟斤拷锟戒府 漂隆锟斤拷锟斤拷锟斤拷锟斤拷锟较匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟戒府锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟戒府锟斤拷锟介俊锟斤拷锟斤拷锟斤拷锟斤拷锟筋恫锟斤拷锟斤拷锟教讹拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷 锟斤拷锟斤拷锟戒府: 锟斤拷锟斤拷 锟斤拷锟斤拷锟戒府 锟斤拷锟斤拷锟绞矫匡拷.

Comparing a local file to a VCS repository:

锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟矫碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟�(VCS) 锟斤拷锟斤拷锟斤拷锟戒府锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟皆诧拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟斤拷锟� VCS锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟睫达拷锟阶革拷锟斤拷锟轿猴拷锟斤拷锟斤拷锟矫碉拷 VCS(CVS, StarTeam 锟斤拷)锟斤拷锟斤拷锟斤拷锟街匡拷锟斤拷锟睫达拷锟阶革拷锟斤拷锟轿猴拷锟斤拷

锟阶革拷锟斤拷锟斤拷锟斤拷锟斤拷钎锟斤拷锟较达拷锟筋恫锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 VCS锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟睫达拷锟阶革拷锟斤拷锟轿猴拷锟斤拷锟今背革拷龋锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟斤拷薮锟� 锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟矫碉拷 VCS锟斤拷锟斤拷锟斤拷锟劫撅拷锟斤拷锟斤拷锟斤拷, 锟阶凤拷锟斤拷 "Compare with"锟斤拷锟� 锟杰撅拷锟� 锟皆诧拷锟阶伙拷锟斤拷锟桔邓聪达拷.

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟秸匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷 锟斤拷锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷洗锟� 锟矫斤拷锟桔匡拷锟斤拷锟斤拷锟斤拷胃锟� 锟斤拷锟斤拷锟较绞矫匡拷.

Comparing a local file to current Editor file:
锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟酵匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较帮拷锟皆诧拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟筋恫锟斤拷锟斤拷锟教讹拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟今背革拷锟斤拷锟斤拷锟� 锟斤拷锟截硷拷:

锟斤拷锟斤拷锟酵匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟解甫锟斤拷锟斤拷锟较绞矫匡拷.

锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷(锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷)锟角达拷锟斤拷锟缴撅拷锟斤拷锟斤拷锟节凤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟酵凤拷锟今背登扁甫锟劫讹拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟睫达拷锟斤拷龋锟斤拷锟较帮拷, Compare File with Editor锟斤拷锟斤拷锟斤拷锟秸聪达拷.

Comparing 2 local files of a recognized type:

锟斤拷锟斤拷锟� IDEA锟斤拷锟斤拷锟斤拷锟轿侥碉拷鸥锟斤拷锟斤拷锟筋恫锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟教讹拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷(锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷)锟角达拷锟斤拷锟缴撅拷锟斤拷锟斤拷锟节匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟截具革拷锟秸聪达拷.

2锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较憋拷锟斤拷锟斤拷:

Project View 锟角达拷 Commander锟竭匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷掳锟斤拷锟矫碉拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟睫达拷锟斤拷龋锟斤拷锟较帮拷 Compare Two Files锟斤拷锟斤拷锟斤拷锟较绞矫匡拷.

锟今背革拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷习锟� 锟街达拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷飘锟斤拷锟斤拷锟解俊锟街斤拷锟较达拷:

o 锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷飘锟斤拷锟解俊锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷羁� 锟斤拷鸥锟斤拷锟较达拷.

o 锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟缴撅拷锟斤拷锟斤拷锟节匡拷锟皆硷拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较革拷, highlighted file锟斤拷锟斤拷锟斤拷锟斤拷羁� left-hand 锟截斤拷飘锟戒俊锟斤拷鸥锟斤拷锟较达拷.

Comparing local 2 binary or other unrecognized files:
It is possible to compare files that IDEA does not recognize as editable.

They show up in content views but cannot be edited in IDEA.

Files can be binary or text, but if you compare two unrecognized files,

IDEA treats them as binary and compares the bits.

If the files are identical, the dialog shown below, left appears. If the files differ, the dialog shown below, right appears.
锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 IDEA锟斤拷锟轿斤拷锟斤拷锟斤拷锟绞达拷锟斤拷锟斤拷锟斤拷锟斤拷锟较达拷锟斤拷锟斤拷锟斤拷锟斤拷锟秸聪达拷. 锟阶碉拷锟斤拷锟斤拷锟斤拷飘锟斤拷饪★拷锟� 锟斤拷鸥锟斤拷锟斤拷锟斤拷 IDEA锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较达拷.

锟斤拷锟斤拷锟斤拷锟斤拷锟教呈革拷锟角达拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 2锟斤拷锟斤拷锟轿斤拷锟较帮拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较革拷, IDEA锟斤拷锟阶碉拷锟斤拷锟斤拷锟教呈革拷锟斤拷锟斤拷锟斤拷锟较帮拷, 锟斤拷飘锟斤拷锟斤拷锟秸聪达拷.

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟较革拷, 锟狡凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟教撅拷伪装锟� 锟斤拷鸥锟斤拷锟较达拷. 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟劫革拷锟斤拷, 锟狡凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟教撅拷伪装锟� 锟斤拷鸥锟斤拷锟较达拷.

Comparing selected text with Clipboard contents:

锟斤拷锟斤拷锟� 努锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟筋恫锟截斤拷飘锟斤拷锟斤拷锟斤拷锟酵匡拷锟斤拷锟斤拷锟矫碉拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟今背革拷锟斤拷锟斤拷锟� 锟斤拷锟截硷拷:

锟斤拷锟斤拷锟� 努锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟较帮拷锟酵撅拷锟较达拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟酵匡拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟较扁甫锟斤拷锟较达拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟睫达拷锟斤拷锟斤拷锟斤拷 Compare with clipboard锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟较革拷锟斤拷锟斤拷锟� 锟狡凤拷锟酵帮拷锟斤拷锟斤拷锟斤拷锟斤拷锟教撅拷伪赘锟� 锟斤拷锟斤拷锟皆聪达拷; 锟阶凤拷锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷 锟斤拷锟� 锟斤拷锟截斤拷飘锟斤拷锟斤拷锟斤拷锟教革拷钎锟斤拷锟较达拷锟酵匡拷锟斤拷锟斤拷锟斤拷锟斤拷锟皆聪达拷.

Comparing a class/class member with a class/class member:

锟斤拷锟斤拷锟� 努锟斤拷锟斤拷锟角达拷努锟斤拷锟斤拷锟斤拷锟斤拷锟� Project View, Commander 锟角达拷 Structure View 锟斤拷锟斤拷峡锟� 锟斤拷锟劫革拷努锟斤拷锟斤拷/努锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟街斤拷锟较达拷.

锟斤拷锟今背革拷锟斤拷锟斤拷锟� 锟斤拷锟截硷拷:

锟今背碉拷锟斤拷锟斤拷锟阶革拷锟斤拷锟斤拷锟斤拷锟较绞矫匡拷

锟斤拷锟斤拷掳锟斤拷锟矫碉拷锟阶革拷锟斤拷锟斤拷锟斤拷, 锟斤拷锟斤拷锟睫达拷锟斤拷龋锟斤拷锟较帮拷锟斤拷锟斤拷锟较达拷锟睫达拷锟阶革拷锟斤拷锟斤拷锟斤拷锟较绞矫匡拷, 锟斤拷 Compare Two Methods , Compare Field with Method 锟斤拷

锟介饭锟斤拷努锟斤拷锟斤拷锟斤拷锟今背达拷锟斤拷眉 Java 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷习锟� 锟角达拷锟斤拷锟皆聪达拷. 锟阶巴碉拷锟斤拷锟斤拷锟斤拷锟解俊锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷目锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟� 锟斤拷锟斤拷锟斤拷锟斤拷锟较达拷锟斤拷锟斤拷锟斤拷锟斤拷锟较帮拷锟秸聪达拷.