<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://w.electrodragon.com/w/index.php?action=history&amp;feed=atom&amp;title=Git_Error</id>
	<title>Git Error - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://w.electrodragon.com/w/index.php?action=history&amp;feed=atom&amp;title=Git_Error"/>
	<link rel="alternate" type="text/html" href="https://w.electrodragon.com/w/index.php?title=Git_Error&amp;action=history"/>
	<updated>2026-07-22T18:03:23Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.37.2</generator>
	<entry>
		<id>https://w.electrodragon.com/w/index.php?title=Git_Error&amp;diff=31237&amp;oldid=prev</id>
		<title>Chao: Created page with &quot;* Committing is not possible because you have unmerged files:  git status  git rm ../Tested/CH554/CH554-CDC-motor/CDC-motor-1.uvgui.Administrator   git commit -m 'fix'  git pu...&quot;</title>
		<link rel="alternate" type="text/html" href="https://w.electrodragon.com/w/index.php?title=Git_Error&amp;diff=31237&amp;oldid=prev"/>
		<updated>2021-05-19T15:04:13Z</updated>

		<summary type="html">&lt;p&gt;Created page with &amp;quot;* Committing is not possible because you have unmerged files:  git status  git rm ../Tested/CH554/CH554-CDC-motor/CDC-motor-1.uvgui.Administrator   git commit -m &amp;#039;fix&amp;#039;  git pu...&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;* Committing is not possible because you have unmerged files:&lt;br /&gt;
 git status&lt;br /&gt;
 git rm ../Tested/CH554/CH554-CDC-motor/CDC-motor-1.uvgui.Administrator &lt;br /&gt;
 git commit -m 'fix'&lt;br /&gt;
 git push&lt;br /&gt;
&lt;br /&gt;
[[category: Git]]&lt;/div&gt;</summary>
		<author><name>Chao</name></author>
	</entry>
</feed>