<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://hackerpedia.org/index.php?action=history&amp;feed=atom&amp;title=Conflict_resolution</id>
	<title>Conflict resolution - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://hackerpedia.org/index.php?action=history&amp;feed=atom&amp;title=Conflict_resolution"/>
	<link rel="alternate" type="text/html" href="https://hackerpedia.org/index.php?title=Conflict_resolution&amp;action=history"/>
	<updated>2026-04-25T19:29:38Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.45.1</generator>
	<entry>
		<id>https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=25879&amp;oldid=prev</id>
		<title>imported&gt;Unknown user at 00:24, 20 January 2026</title>
		<link rel="alternate" type="text/html" href="https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=25879&amp;oldid=prev"/>
		<updated>2026-01-20T00:24:28Z</updated>

		<summary type="html">&lt;p&gt;&lt;/p&gt;
&lt;table style=&quot;background-color: #fff; color: #202122;&quot; data-mw=&quot;interface&quot;&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;tr class=&quot;diff-title&quot; lang=&quot;en&quot;&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #202122; text-align: center;&quot;&gt;← Older revision&lt;/td&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #202122; text-align: center;&quot;&gt;Revision as of 00:24, 20 January 2026&lt;/td&gt;
				&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;4&quot; class=&quot;diff-notice&quot; lang=&quot;en&quot;&gt;&lt;div class=&quot;mw-diff-empty&quot;&gt;(No difference)&lt;/div&gt;
&lt;/td&gt;&lt;/tr&gt;
&lt;!-- diff cache key wiki:diff:1.41:old-15971:rev-25879 --&gt;
&lt;/table&gt;</summary>
		<author><name>imported&gt;Unknown user</name></author>
	</entry>
	<entry>
		<id>https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=15971&amp;oldid=prev</id>
		<title>imported&gt;Unknown user at 02:53, 15 January 2026</title>
		<link rel="alternate" type="text/html" href="https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=15971&amp;oldid=prev"/>
		<updated>2026-01-15T02:53:33Z</updated>

		<summary type="html">&lt;p&gt;&lt;/p&gt;
&lt;table style=&quot;background-color: #fff; color: #202122;&quot; data-mw=&quot;interface&quot;&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;tr class=&quot;diff-title&quot; lang=&quot;en&quot;&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #202122; text-align: center;&quot;&gt;← Older revision&lt;/td&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #202122; text-align: center;&quot;&gt;Revision as of 02:53, 15 January 2026&lt;/td&gt;
				&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;4&quot; class=&quot;diff-notice&quot; lang=&quot;en&quot;&gt;&lt;div class=&quot;mw-diff-empty&quot;&gt;(No difference)&lt;/div&gt;
&lt;/td&gt;&lt;/tr&gt;
&lt;!-- diff cache key wiki:diff:1.41:old-6173:rev-15971 --&gt;
&lt;/table&gt;</summary>
		<author><name>imported&gt;Unknown user</name></author>
	</entry>
	<entry>
		<id>https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=6173&amp;oldid=prev</id>
		<title>imported&gt;Unknown user at 01:42, 15 January 2026</title>
		<link rel="alternate" type="text/html" href="https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=6173&amp;oldid=prev"/>
		<updated>2026-01-15T01:42:27Z</updated>

		<summary type="html">&lt;p&gt;&lt;/p&gt;
&lt;table style=&quot;background-color: #fff; color: #202122;&quot; data-mw=&quot;interface&quot;&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;col class=&quot;diff-marker&quot; /&gt;
				&lt;col class=&quot;diff-content&quot; /&gt;
				&lt;tr class=&quot;diff-title&quot; lang=&quot;en&quot;&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #202122; text-align: center;&quot;&gt;← Older revision&lt;/td&gt;
				&lt;td colspan=&quot;2&quot; style=&quot;background-color: #fff; color: #202122; text-align: center;&quot;&gt;Revision as of 01:42, 15 January 2026&lt;/td&gt;
				&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;4&quot; class=&quot;diff-notice&quot; lang=&quot;en&quot;&gt;&lt;div class=&quot;mw-diff-empty&quot;&gt;(No difference)&lt;/div&gt;
&lt;/td&gt;&lt;/tr&gt;
&lt;!-- diff cache key wiki:diff:1.41:old-858:rev-6173 --&gt;
&lt;/table&gt;</summary>
		<author><name>imported&gt;Unknown user</name></author>
	</entry>
	<entry>
		<id>https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=858&amp;oldid=prev</id>
		<title>imported&gt;Unknown user at 00:12, 15 January 2026</title>
		<link rel="alternate" type="text/html" href="https://hackerpedia.org/index.php?title=Conflict_resolution&amp;diff=858&amp;oldid=prev"/>
		<updated>2026-01-15T00:12:26Z</updated>

		<summary type="html">&lt;p&gt;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;{{LanguageHeader|en}}&lt;br /&gt;
{{CyberTerm|definition=A predefined method for coming to a consensus on the state of the system. For example, when portions of the system participants claim there is State_A and the rest of the participants claim there is State_B, there is a conflict. The system will automatically resolve this conflict by choosing the “valid” state as being the one from whichever group adds the next block of data. Any transactions “lost” by the state not chosen are added back into the pending transaction pool.|source=NISTIR 8202}}&lt;/div&gt;</summary>
		<author><name>imported&gt;Unknown user</name></author>
	</entry>
</feed>