|
|
il y a 1 an | |
|---|---|---|
| APP | il y a 1 an | |
| BSP | il y a 1 an | |
| Object | il y a 1 an | |
| User | il y a 1 an | |
| _Lib-3.5 | il y a 1 an | |
| _uCOS-III | il y a 1 an | |
| notes | il y a 1 an | |
| .gitignore | il y a 1 an | |
| README.md | il y a 1 an |
C:\Users\WBJW0>d:
D:>cd D:\jm\code\collect\app\0201_APP
D:\jm\code\collect\app\0201_APP>git branch dev
D:\jm\code\collect\app\0201_APP>git checkout dev
Switched to branch 'dev'
合并分支
D:\jm\code\collect\app\0201_APP>git checkout master
将dev合并到master
D:\jm\code\collect\app\0201_APP>git merge dev