From 071f4b16a6612824872c7edaa122c405d06ad5ee Mon Sep 17 00:00:00 2001 From: Alexander Hampel Date: Wed, 2 Aug 2023 15:13:45 -0400 Subject: [PATCH] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 52e2c0b4..1657290f 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ You can merge future changes to the app4triqs skeleton into your project with th ```bash git remote update -git merge app4triqs_remote/unstable -m "Merge latest app4triqs skeleton changes" +git merge app4triqs_remote/unstable -X ours -m "Merge latest app4triqs skeleton changes" ``` If you should encounter any conflicts resolve them and `git commit`. @@ -47,6 +47,11 @@ Finally we repeat the replace and rename command from the initial setup. git commit --amend ``` +Now you can compare against the previous commit with: +```bash +git diff prev_git_hash +```` + Getting Started ---------------