vs中git提交合并分支的步骤记录

vs打开终端
PS D:\project\et_lower4_driver> git pull
Already up to date.
PS D:\project\et_lower4_driver> git branch
* kiyun_usb7851
  master
PS D:\project\et_lower4_driver> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\project\et_lower4_driver> git branch
  kiyun_usb7851
* master
PS D:\project\et_lower4_driver> git pull
Already up to date.
PS D:\project\et_lower4_driver> git checkout kiyun_usb7851
Switched to branch 'kiyun_usb7851'
Your branch is up to date with 'origin/kiyun_usb7851'.
PS D:\project\et_lower4_driver> git merge master
Removing et_zlg/USBCAN2EU/vi_linux.json   
Removing et_ni/6704/include_win/nicaiu.dll
Removing et_ni/6224/include_win/nicaiu.dll
Merge made by the 'recursive' strategy.
 CMakeLists.txt                                     |    3 +
 et_adlinktech/ALK7841/CMakeLists.txt               |    3 +-
 .../ALK7841/adapter/adapter_adlinktech_ALK7841.h   |    5 +-
 .../adapter/adapter_adlinktech_ALK7841_CAN.c       |    4 +-
 et_adlinktech/ALK7841/include_linux/commdef.h      |   82 +
 et_adlinktech/ALK7841/include_linux/libpci_7841.so |  Bin 0 -> 25840 bytes    
 et_adlinktech/ALK7841/include_linux/pci_7841.h     |  159 +
 et_adlinktech/ALK7841/include_linux/setting.yml    |   19 +
 et_adlinktech/ALK7841/vi_linux.json                |    8 +-
 .../adapter/adapter_advantech_ADVACAN_CAN.h        |    1 +
 .../ADVACAN_LINUX/comm/advantech_ADVACAN_CAN.c     |    4 +-
 et_advantech/ADVACAN_WIN/CMakeLists.txt            |    1 -
 et_advantech/PCIE1810/CMakeLists.txt               |    8 +-
 et_advantech/PCIE1810/include_linux/bdaqctrl.h     | 6476 ++++++++++++++++++++
 .../PCIE1810/include_linux/compatibility.h         |   37 +
 et_advantech/PCIE1810/include_linux/libbiodaq.so   |  Bin 0 -> 1721590 bytes
 et_ni/2568/CMakeLists.txt                          |   11 +-
 et_ni/2568/adapter/adapter_ni_2568.c               |    6 +-
 et_ni/2568/adapter/adapter_ni_2568_DO.c            |    4 +-
 et_ni/2568/adapter/adapter_ni_2568_DO.h            |    2 +-
 et_ni/2568/comm/ni_2568.c                          |    8 +-
 et_ni/2568/comm/ni_2568.h                          |    2 +-
 et_ni/2568/comm/ni_2568_DO.c                       |   10 +-
 et_ni/2568/vi_linux.json                           |    2 +-
 et_ni/6224/CMakeLists.txt                          |   11 +-
 et_ni/6224/adapter/adapter_ni_6224.c               |    4 +-
 et_ni/6224/adapter/adapter_ni_6224.h               |    4 +-
 et_ni/6224/adapter/adapter_ni_6224_AI.c            |    6 +-
 et_ni/6224/adapter/adapter_ni_6224_AI.h            |    2 +-
 et_ni/6224/adapter/adapter_ni_6224_DI.c            |    6 +-
 et_ni/6224/adapter/adapter_ni_6224_DO.c            |    8 +-
 et_ni/6224/adapter/adapter_ni_6224_DO.h            |    2 +-
 et_ni/6224/adapter/adapter_ni_6224_PI.c            |    6 +-
 et_ni/6224/adapter/adapter_ni_6224_PI.h            |    2 +-
 et_ni/6224/adapter/adapter_ni_6224_PO.c            |    6 +-
 et_ni/6224/comm/ni_6224_DO.c                       |   13 +-
 et_ni/6224/comm/ni_6224_PI.c                       |   16 +-
 et_ni/6224/comm/ni_6224_PO.c                       |    5 +-
 et_ni/6224/include_win/nicaiu.dll                  |  Bin 4365552 -> 0 bytes
 et_ni/6224/include_win/setting.yml                 |   63 +-
 et_ni/6224/vi_linux.json                           |  556 +-
 et_ni/6224/vi_win.json                             |  564 +-
 et_ni/6704/CMakeLists.txt                          |   11 +-
 et_ni/6704/adapter/adapter_ni_6704.c               |    4 +-
 et_ni/6704/adapter/adapter_ni_6704_AO.c            |    6 +-
 et_ni/6704/adapter/adapter_ni_6704_AO.h            |    2 +-
 et_ni/6704/adapter/adapter_ni_6704_DI.c            |    6 +-
 et_ni/6704/adapter/adapter_ni_6704_DI.h            |    2 +-
 et_ni/6704/adapter/adapter_ni_6704_DO.c            |    6 +-
 et_ni/6704/adapter/adapter_ni_6704_DO.h            |    2 +-
 et_ni/6704/comm/ni_6704.c                          |   34 +-
 et_ni/6704/comm/ni_6704.h                          |    8 +-
 et_ni/6704/comm/ni_6704_AO.c                       |    2 +-
 et_ni/6704/comm/ni_6704_DI.c                       |    2 +-
 et_ni/6704/comm/ni_6704_DO.c                       |    2 +-
 et_ni/6704/include_win/nicaiu.dll                  |  Bin 4365552 -> 0 bytes
 et_ni/6704/vi_linux.json                           |    4 +-
 et_ni/6704/vi_win.json                             |   10 +-
 et_ni/{2568/include_win => lib_win}/nicaiu.dll     |  Bin
 et_zlg/CMakeLists.txt                              |    7 +-
 et_zlg/USBCAN2/CMakeLists.txt                      |   41 +
 et_zlg/USBCAN2/vi_linux.json                       |   16 +-
 et_zlg/USBCAN2EU/CMakeLists.txt                    |   29 +-
 et_zlg/USBCAN2EU/adapter/adapter_zlg_USBCAN2EU.c   |    6 +-
 et_zlg/USBCAN2EU/adapter/adapter_zlg_USBCAN2EU.h   |    8 +-
 .../USBCAN2EU/adapter/adapter_zlg_USBCAN2EU_CAN.c  |    1 -
 et_zlg/USBCAN2EU/comm/zlg_USBCAN2EU.c              |    3 +-
 et_zlg/USBCAN2EU/comm/zlg_USBCAN2EU.h              |    1 -
 et_zlg/USBCAN2EU/comm/zlg_USBCAN2EU_can.c          |    2 +-
 et_zlg/USBCAN2EU/include_linux/controlcan.h        |  175 +
 et_zlg/USBCAN2EU/include_linux/libusbcan.so        |  Bin 0 -> 93667 bytes
 et_zlg/USBCAN2EU/include_win/ControlCAN.h          |    2 +-
 et_zlg/USBCAN2EU/include_win/setting.yml           |   20 +
 et_zlg/USBCAN2EU/vi_linux.json                     |   29 -
 80 files changed, 8104 insertions(+), 548 deletions(-)
 create mode 100644 et_adlinktech/ALK7841/include_linux/commdef.h
 create mode 100644 et_adlinktech/ALK7841/include_linux/libpci_7841.so
 create mode 100644 et_adlinktech/ALK7841/include_linux/pci_7841.h
 create mode 100644 et_adlinktech/ALK7841/include_linux/setting.yml
 create mode 100644 et_advantech/PCIE1810/include_linux/bdaqctrl.h
 create mode 100644 et_advantech/PCIE1810/include_linux/compatibility.h
 create mode 100644 et_advantech/PCIE1810/include_linux/libbiodaq.so
 delete mode 100644 et_ni/6224/include_win/nicaiu.dll
 delete mode 100644 et_ni/6704/include_win/nicaiu.dll
 rename et_ni/{2568/include_win => lib_win}/nicaiu.dll (100%)
 create mode 100644 et_zlg/USBCAN2/CMakeLists.txt
 create mode 100644 et_zlg/USBCAN2EU/include_linux/controlcan.h
 create mode 100644 et_zlg/USBCAN2EU/include_linux/libusbcan.so
 create mode 100644 et_zlg/USBCAN2EU/include_win/setting.yml
 delete mode 100644 et_zlg/USBCAN2EU/vi_linux.json
PS D:\project\et_lower4_driver> git status
On branch kiyun_usb7851
Your branch is ahead of 'origin/kiyun_usb7851' by 28 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
PS D:\project\et_lower4_driver>
PS D:\project\et_lower4_driver>
PS D:\project\et_lower4_driver>
PS D:\project\et_lower4_driver>
PS D:\project\et_lower4_driver> git push -u origin kiyun_usb7851