Skip to content

Commit

Permalink
Added note about merge commit
Browse files Browse the repository at this point in the history
  • Loading branch information
compscidr committed Jun 16, 2023
1 parent 87b21d4 commit 7edcd46
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 7edcd46

Please sign in to comment.