From 7edcd46367a3d7972f03cf5b093b2298af09afe5 Mon Sep 17 00:00:00 2001 From: Jason Ernst Date: Fri, 16 Jun 2023 16:11:35 -0700 Subject: [PATCH] Added note about merge commit --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 48d32d3..bf7ab94 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,13 @@ https://github.com/compscidr/hello-kotlin-android/compare/staging..main https://github.com/compscidr/hello-kotlin-android/compare/production..staging ## Merge-backs +NOTE: the mergeback should be a merge commit, not a squash commit or will result in a diff when +comparing branches later on. + Ideally you find no diff: https://github.com/compscidr/hello-kotlin-android/compare/main...production https://github.com/compscidr/hello-kotlin-android/compare/main...staging https://github.com/compscidr/hello-kotlin-android/compare/staging...production -If you find a diff, check the 2-dot commit history to see if it's a merge-back. If it is, then the 2-dot history will be empty: -https://github.com/compscidr/hello-kotlin-android/compare/main..production -https://github.com/compscidr/hello-kotlin-android/compare/main..staging -https://github.com/compscidr/hello-kotlin-android/compare/staging..production - TODO: * [Firebase](https://firebase.google.com/docs/crashlytics)