From a7501433a56786fe1b28158f1c414325a20d4e96 Mon Sep 17 00:00:00 2001 From: usagi-flow <2804556+usagi-flow@users.noreply.github.com> Date: Wed, 15 May 2024 20:56:11 +0200 Subject: [PATCH] doc(evil): add a notice regarding the branch being rebased --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 45ec77def..f6dbcb545 100644 --- a/README.md +++ b/README.md @@ -64,4 +64,8 @@ this project will seek to keep a user-friendly alternative. - Isolate features to minimize conflicts with upstream changes - Contribute features to upstream where possible - Ensure (through CI) that rebasing is always possible - - Find a name for this project \ No newline at end of file + - Find a name for this project + +## Development + +Keep in mind the `main` branch is regularly being rebased onto the upstream `master` branch. \ No newline at end of file