mirror of
https://github.com/triqs/dft_tools
synced 2024-10-14 12:01:36 +02:00
Update README.md
This commit is contained in:
parent
59674b1b9a
commit
071f4b16a6
@ -36,7 +36,7 @@ You can merge future changes to the app4triqs skeleton into your project with th
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
git remote update
|
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`.
|
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
|
git commit --amend
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Now you can compare against the previous commit with:
|
||||||
|
```bash
|
||||||
|
git diff prev_git_hash
|
||||||
|
````
|
||||||
|
|
||||||
Getting Started
|
Getting Started
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user