From b959739b5334060628901294c54b2439574091f0 Mon Sep 17 00:00:00 2001
From: Alex Xu <alexkurosakimh3@gmail.com>
Date: Sun, 30 Mar 2025 07:33:48 -0700
Subject: [PATCH] For contributers, please "Sync fork" instead of "git merge"
 readme note (#888)

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 6a8a99b..a66de4d 100644
--- a/README.md
+++ b/README.md
@@ -254,6 +254,9 @@ Then use the `gen_ui_files` scripts to autogenerate the python UI.
 
 An example PR adding a new checkbox is here: https://github.com/ciromattia/kcc/pull/785
 
+Do not use `git merge` to merge master from upstream, 
+use the "Sync fork" button on your fork on GitHub in your branch 
+to avoid weird looking merges in pull requests.
 
 ### Windows install from source