agaric/documentation
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add advice on using git

Browse source
This commit is contained in:
benjamin melançon 2021-06-18 22:35:41 -04:00
parent c7c34c1d79
commit 3b376b8946
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/git-usage.md Normal file
View file

@ -0,0 +1,14 @@
# Git Usage
## When NOT to manually resolve merge conflicts
When it's an automatically generated file!
For composer.json:
```
rm composer.lock
ddev composer update
git add composer.lock
git commit
```