Warning, /sdk/kommit/src/libkommitwidgets/dialogs/mergedialog.ui is written in an unsupported language. File is not indexed.
0001 <?xml version="1.0" encoding="UTF-8"?> 0002 <ui version="4.0"> 0003 <class>MergeDialog</class> 0004 <widget class="QDialog" name="MergeDialog"> 0005 <property name="geometry"> 0006 <rect> 0007 <x>0</x> 0008 <y>0</y> 0009 <width>437</width> 0010 <height>475</height> 0011 </rect> 0012 </property> 0013 <property name="windowTitle"> 0014 <string>Merge</string> 0015 </property> 0016 <layout class="QVBoxLayout" name="verticalLayout_2"> 0017 <item> 0018 <layout class="QFormLayout" name="formLayout"> 0019 <item row="0" column="0"> 0020 <widget class="QLabel" name="label_2"> 0021 <property name="text"> 0022 <string>From:</string> 0023 </property> 0024 </widget> 0025 </item> 0026 <item row="0" column="1"> 0027 <widget class="QComboBox" name="comboBoxBranchName"/> 0028 </item> 0029 <item row="5" column="0"> 0030 <widget class="QLabel" name="label"> 0031 <property name="text"> 0032 <string>Strategy:</string> 0033 </property> 0034 </widget> 0035 </item> 0036 <item row="5" column="1"> 0037 <widget class="QComboBox" name="comboBoxStrategy"> 0038 <property name="whatsThis"> 0039 <string><html><head/><body><p>The merge mechanism (git merge and git pull commands) allows the backend merge strategies to be chosen with -s option. Some strategies can also take their own options, which can be passed by giving -X&lt;option&gt; arguments to git merge and/or git pull.</p><p><a href="https://git-scm.com/docs/merge-strategies"><span style=" text-decoration: underline; color:#2980b9;">More information</span></a></p></body></html></string> 0040 </property> 0041 </widget> 0042 </item> 0043 <item row="1" column="0"> 0044 <widget class="QLabel" name="label_3"> 0045 <property name="text"> 0046 <string>To:</string> 0047 </property> 0048 </widget> 0049 </item> 0050 <item row="1" column="1"> 0051 <widget class="QLabel" name="labelToBranchName"> 0052 <property name="text"> 0053 <string>-</string> 0054 </property> 0055 </widget> 0056 </item> 0057 <item row="2" column="0"> 0058 <widget class="QLabel" name="label_4"> 0059 <property name="text"> 0060 <string>Fast forward:</string> 0061 </property> 0062 </widget> 0063 </item> 0064 <item row="2" column="1"> 0065 <widget class="QComboBox" name="comboBoxFastForward"> 0066 <property name="whatsThis"> 0067 <string><html><head/><body><p>Specifies how a merge is handled when the merged-in history is already a descendant of the current history.</p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---ff"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0068 </property> 0069 <item> 0070 <property name="text"> 0071 <string>Default</string> 0072 </property> 0073 </item> 0074 <item> 0075 <property name="text"> 0076 <string>Allow fast forward</string> 0077 </property> 0078 </item> 0079 <item> 0080 <property name="text"> 0081 <string>Fast forward only</string> 0082 </property> 0083 </item> 0084 <item> 0085 <property name="text"> 0086 <string>No fast forward</string> 0087 </property> 0088 </item> 0089 </widget> 0090 </item> 0091 <item row="3" column="1"> 0092 <widget class="QCheckBox" name="checkBoxAllowUnrelatedHistories"> 0093 <property name="whatsThis"> 0094 <string><html><head/><body><p>By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added.</p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---allow-unrelated-histories"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0095 </property> 0096 <property name="text"> 0097 <string>Allow unrelated histories</string> 0098 </property> 0099 <property name="tristate"> 0100 <bool>true</bool> 0101 </property> 0102 </widget> 0103 </item> 0104 <item row="4" column="1"> 0105 <widget class="QCheckBox" name="checkBoxSquash"> 0106 <property name="whatsThis"> 0107 <string><html><head/><body><p>Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).</p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---squash"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0108 </property> 0109 <property name="text"> 0110 <string>Squash</string> 0111 </property> 0112 <property name="tristate"> 0113 <bool>true</bool> 0114 </property> 0115 </widget> 0116 </item> 0117 </layout> 0118 </item> 0119 <item> 0120 <widget class="QStackedWidget" name="stackedWidget"> 0121 <property name="currentIndex"> 0122 <number>2</number> 0123 </property> 0124 <widget class="QWidget" name="pageEmpty"/> 0125 <widget class="QWidget" name="pageStrategyOrt"> 0126 <layout class="QVBoxLayout" name="verticalLayout_3"> 0127 <item> 0128 <widget class="QRadioButton" name="radioButtonDefault"> 0129 <property name="text"> 0130 <string>Default</string> 0131 </property> 0132 <property name="checked"> 0133 <bool>true</bool> 0134 </property> 0135 </widget> 0136 </item> 0137 <item> 0138 <widget class="QRadioButton" name="radioButtonOurs"> 0139 <property name="text"> 0140 <string>Ours</string> 0141 </property> 0142 </widget> 0143 </item> 0144 <item> 0145 <widget class="QRadioButton" name="radioButtonTheirs"> 0146 <property name="text"> 0147 <string>Theirs</string> 0148 </property> 0149 </widget> 0150 </item> 0151 <item> 0152 <widget class="QCheckBox" name="checkBoxIgnoreSpaceChanges"> 0153 <property name="whatsThis"> 0154 <string><html><head/><body><p>Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. </p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-ignore-space-change"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0155 </property> 0156 <property name="text"> 0157 <string>Ignore space change</string> 0158 </property> 0159 </widget> 0160 </item> 0161 <item> 0162 <widget class="QCheckBox" name="checkBoxIgnoreAllSpace"> 0163 <property name="whatsThis"> 0164 <string><html><head/><body><p>Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. </p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-ignore-space-change"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0165 </property> 0166 <property name="text"> 0167 <string>Ignore all space</string> 0168 </property> 0169 </widget> 0170 </item> 0171 <item> 0172 <widget class="QCheckBox" name="checkBoxIgnoreSpaceAtEol"> 0173 <property name="whatsThis"> 0174 <string><html><head/><body><p>Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. </p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-ignore-space-change"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0175 </property> 0176 <property name="text"> 0177 <string>Ignore space at eol</string> 0178 </property> 0179 </widget> 0180 </item> 0181 <item> 0182 <widget class="QCheckBox" name="checkBoxIgnoreCrAtEol"> 0183 <property name="whatsThis"> 0184 <string><html><head/><body><p>Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. </p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-ignore-space-change"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0185 </property> 0186 <property name="text"> 0187 <string>Ignore cr at eol</string> 0188 </property> 0189 </widget> 0190 </item> 0191 <item> 0192 <widget class="QCheckBox" name="checkBoxRenormalize"> 0193 <property name="whatsThis"> 0194 <string><html><head/><body><p>This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules.</p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-renormalize"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0195 </property> 0196 <property name="text"> 0197 <string>Renormalize</string> 0198 </property> 0199 <property name="tristate"> 0200 <bool>true</bool> 0201 </property> 0202 </widget> 0203 </item> 0204 </layout> 0205 </widget> 0206 <widget class="QWidget" name="pageStrategyRecursive"> 0207 <layout class="QFormLayout" name="formLayout_2"> 0208 <item row="0" column="0"> 0209 <widget class="QLabel" name="label_5"> 0210 <property name="text"> 0211 <string>Diff algorithm:</string> 0212 </property> 0213 </widget> 0214 </item> 0215 <item row="0" column="1"> 0216 <widget class="QComboBox" name="comboBoxDiffAlgoritm"> 0217 <property name="whatsThis"> 0218 <string><html><head/><body><p>Use a different diff algorithm while merging, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions).</p><p><br/></p><p><a href="https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-diff-algorithmpatienceminimalhistogrammyers"><span style=" text-decoration: underline; color:#007af4;">More information</span></a></p></body></html></string> 0219 </property> 0220 </widget> 0221 </item> 0222 <item row="1" column="1"> 0223 <widget class="QCheckBox" name="checkBoxNoRenames"> 0224 <property name="text"> 0225 <string>Turn off rename detection</string> 0226 </property> 0227 <property name="tristate"> 0228 <bool>true</bool> 0229 </property> 0230 </widget> 0231 </item> 0232 <item row="2" column="1"> 0233 <spacer name="verticalSpacer_2"> 0234 <property name="orientation"> 0235 <enum>Qt::Vertical</enum> 0236 </property> 0237 <property name="sizeHint" stdset="0"> 0238 <size> 0239 <width>20</width> 0240 <height>40</height> 0241 </size> 0242 </property> 0243 </spacer> 0244 </item> 0245 </layout> 0246 </widget> 0247 </widget> 0248 </item> 0249 <item> 0250 <spacer name="verticalSpacer"> 0251 <property name="orientation"> 0252 <enum>Qt::Vertical</enum> 0253 </property> 0254 <property name="sizeHint" stdset="0"> 0255 <size> 0256 <width>20</width> 0257 <height>40</height> 0258 </size> 0259 </property> 0260 </spacer> 0261 </item> 0262 <item> 0263 <widget class="QDialogButtonBox" name="buttonBox"> 0264 <property name="standardButtons"> 0265 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> 0266 </property> 0267 </widget> 0268 </item> 0269 </layout> 0270 </widget> 0271 <tabstops> 0272 <tabstop>comboBoxBranchName</tabstop> 0273 <tabstop>comboBoxStrategy</tabstop> 0274 </tabstops> 0275 <resources/> 0276 <connections> 0277 <connection> 0278 <sender>buttonBox</sender> 0279 <signal>rejected()</signal> 0280 <receiver>MergeDialog</receiver> 0281 <slot>reject()</slot> 0282 <hints> 0283 <hint type="sourcelabel"> 0284 <x>201</x> 0285 <y>465</y> 0286 </hint> 0287 <hint type="destinationlabel"> 0288 <x>227</x> 0289 <y>333</y> 0290 </hint> 0291 </hints> 0292 </connection> 0293 <connection> 0294 <sender>buttonBox</sender> 0295 <signal>accepted()</signal> 0296 <receiver>MergeDialog</receiver> 0297 <slot>accept()</slot> 0298 <hints> 0299 <hint type="sourcelabel"> 0300 <x>121</x> 0301 <y>458</y> 0302 </hint> 0303 <hint type="destinationlabel"> 0304 <x>56</x> 0305 <y>434</y> 0306 </hint> 0307 </hints> 0308 </connection> 0309 </connections> 0310 </ui>