raab/GP2023_chirp_detection
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hello world

Browse Source
This commit is contained in:
tillraab 2023-01-10 15:14:30 +01:00
parent 72aa9990a6
commit 4a8fd2ab94
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -43,7 +43,9 @@ git checkout master
git checkout -b <new branch> git checkout -b <new branch>
``` ```
- remerging with master branch
- Re-merging with master branch
1) get current version of master and implement it into branch
```shell ```shell
git checkout master git checkout master
git pull origin master git pull origin master
@ -53,4 +55,10 @@ git rebase master
This resets you branch to the fork-point, executes all commits of the current master before adding the commits of you This resets you branch to the fork-point, executes all commits of the current master before adding the commits of you
branch. You may have to resolve potential conflicts. Afterwards commit the corrected version and push it to your branch. branch. You may have to resolve potential conflicts. Afterwards commit the corrected version and push it to your branch.
Push changes into master-branch. 2) Update master branch master
- correct way: Create
```shell
git checkout master
git merge <branch>
git push origin master
```