合并冲突后,我需要删除添加在不同文件中的某些字符,完成此操作后,我会收到此错误:
第621行:开始和结束标记不匹配:textView 557行和子视图
557行:
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="0L0-L4-EMJ" userLabel="Job Text View" customClass="RoundText" customModule="Arvice" customModuleProvider="target">
第621行:
</subviews>
557-621之间行的代码完整:
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="0L0-L4-EMJ" userLabel="Job Text View" customClass="RoundText" customModule="Arvice" customModuleProvider="target">
<rect key="frame" x="16" y="372" width="343" height="225"/>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="0L0-L4-EMJ" userLabel="Job Text View" customClass="RoundText" customModule="Arvice" customModuleProvider="target">
<rect key="frame" x="16" y="128" width="343" height="325"/>
<color key="backgroundColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="0.75296982020547942" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="225" id="VOt-bF-NX1"/>
</constraints>
<color key="textColor" red="1" green="0.96078431369999995" blue="0.019607843140000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="Brandish" family="Brandish" pointSize="18"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" red="1" green="0.96078431369999995" blue="0.019607843140000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="30"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="grV-x2-o7U" customClass="CustomizableButton" customModule="Arvice" customModuleProvider="target">
<rect key="frame" x="16" y="611" width="343" height="40"/>
<rect key="frame" x="16" y="392" width="343" height="30"/>
<color key="backgroundColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="0.75296982020000003" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="en1-xh-J1M"/>
</constraints>
<fontDescription key="fontDescription" name="Brandish" family="Brandish" pointSize="18"/>
<state key="normal" title="Add "/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="15"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="postPressed:" destination="ZTf-cm-rjD" eventType="touchUpInside" id="gEw-Za-Xl5"/>
</connections>
</button>
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XAx-Sp-9p1" customClass="GADBannerView">
<rect key="frame" x="0.0" y="64" width="375" height="22"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GVF-qY-rRW">
<rect key="frame" x="99" y="189" width="176" height="175"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tOi-sI-3OX" customClass="RoundLabel" customModule="Arvice" customModuleProvider="target">
<rect key="frame" x="69" y="136" width="290" height="45"/>
<color key="backgroundColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="0.75296982020000003" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="15"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tfM-0s-pL1">
<rect key="frame" x="16" y="136" width="45" height="45"/>
<constraints>
<constraint firstAttribute="width" constant="45" id="Tnf-xp-PXp"/>
<constraint firstAttribute="height" constant="45" id="vEc-bG-e1e"/>
</constraints>
</imageView>
</subviews>
答案 0 :(得分:1)
您有两个带有相同textView
的{{1}}标签,但只有一个结束标签。看起来像合并问题。