D51843.1782772670.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51843.1782772670.diff
View Options

	diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
	--- a/documentation/content/en/articles/committers-guide/_index.adoc
	+++ b/documentation/content/en/articles/committers-guide/_index.adoc
	@@ -833,8 +833,10 @@
	Could not apply 646e0f9cda11... no color ls
	....
	which looks scary.
	+
	If you bring up an editor, you will see it is a typical 3-way merge conflict resolution that you may be familiar with from other source code systems (the rest of ls.c has been omitted):
	[source,shell]
	+....
	<<<<<<< HEAD
	#ifdef COLORLS_NEW
	#include <terminfo.h>
	@@ -844,7 +846,9 @@
	#include <termcap.h>
	>>>>>>> 646e0f9cda11... no color ls
	....
	+
	The new code is first, and your code is second.
	+
	The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes:
	[source,shell]
	....
	@@ -853,6 +857,7 @@
	#include <terminfo.h>
	....
	save the file.
	+
	The rebase was interrupted, so you have to complete it:
	[source,shell]
	....