LCPQ
/
dft_tools
mirror of https://github.com/triqs/dft_tools
3
0
Fork 0
Code Issues Releases Wiki Activity

Update README.md

This commit is contained in:
Alexander Hampel 2023-08-02 15:13:45 -04:00 committed by GitHub
parent 59674b1b9a
commit 071f4b16a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -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
---------------