Update README.md
This commit is contained in:
parent
5e8b80102a
commit
cd4de1a156
1 changed files with 7 additions and 2 deletions
|
|
@ -54,7 +54,7 @@ pipenv run python .
|
||||||
## Git Flows
|
## Git Flows
|
||||||
> In progress! 🚧
|
> In progress! 🚧
|
||||||
|
|
||||||
### New Development Flow
|
#### New Development Flow
|
||||||
```
|
```
|
||||||
# clone repo with local_name enables several clones
|
# clone repo with local_name enables several clones
|
||||||
git clone <repo> <local_name>
|
git clone <repo> <local_name>
|
||||||
|
|
@ -66,7 +66,12 @@ git checkout <feature/featurename>
|
||||||
# switched branch: branch out from
|
# switched branch: branch out from
|
||||||
git checkout <feature/newfeature>
|
git checkout <feature/newfeature>
|
||||||
git branch <feature/newfeature>
|
git branch <feature/newfeature>
|
||||||
git push --set-upstream origin feature/sql-and-xml-validation
|
git push --set-upstream origin <feature/newfeature>
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Comparing / Merging two branches
|
||||||
|
```
|
||||||
|
git merge --no-commit --no-ff <feature/otherfeaturebranch>
|
||||||
```
|
```
|
||||||
|
|
||||||
## Repo Badges
|
## Repo Badges
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue