git getting started

2019/4/25--

after committing to blessed.

modify dependency file to download file so as to get latest!

git status:

on what branch

modification

git diff:

git branch:

git log --stat

see all commit

1. setup repository

local

fork:

blessed

2. commit, push and pull

2.1 commit staged changes

2.2 git push origin

git remote -v

2.3 in codebeamer, enter in fork, send pull request (develop-->develop)

3. merge

right way?

4. baseline

2.1 create tag

2.2 push tag

3. check work

see blessed?

4. relate task to commit

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git push fork
fatal: 'fork' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git status
On branch develop
Your branch is up-to-date with 'blessed/develop'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

modified: make/prj_default/m_project_cfg.mak

no changes added to commit (use "git add" and/or "git commit -a")

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git diff
diff --git a/make/prj_default/m_project_cfg.mak b/make/prj_default/m_project_cfg.mak
index 091704c..818832f 100644
--- a/make/prj_default/m_project_cfg.mak
+++ b/make/prj_default/m_project_cfg.mak
@@ -66,8 +66,8 @@ include $(W_POT_AR_WORK_PATH)/make/post_build_cfg.mak
#--- pot generic variant --- default / debug_uart / debug_xcp ---#
POT_GENERIC_VARIANT = default

-#--- latch variant --- Witte / Brose / Nissan ---#
-LATCH_VARIANT = Witte
+#--- latch variant --- Witte / Brose / Nissan /Magna ---#^M
+LATCH_VARIANT = Magna^M
diff --git a/make/prj_default/m_project_cfg.mak b/make/prj_default/m_project_cfg.mak
index 091704c..818832f 100644
--- a/make/prj_default/m_project_cfg.mak
+++ b/make/prj_default/m_project_cfg.mak
@@ -66,8 +66,8 @@ include $(W_POT_AR_WORK_PATH)/make/post_build_cfg.mak
#--- pot generic variant --- default / debug_uart / debug_xcp ---#
POT_GENERIC_VARIANT = default

-#--- latch variant --- Witte / Brose / Nissan ---#
-LATCH_VARIANT = Witte
+#--- latch variant --- Witte / Brose / Nissan /Magna ---#^M
+LATCH_VARIANT = Magna^M

#--- ecu abstraction variant --- mgb_relay / mgb_halfbridge ---#
ECU_AB_VARIANT = mgb_halfbridge
@@ -129,9 +129,9 @@ IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/Mod_HMI/inc
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/Mod_NetworkButton/inc
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/Mod_SensorButton/inc
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/inc
-IMPORT_SCI_HEADER_PATH += -I M_pot_ar_latch/Mod_SensorLatch/inc
-IMPORT_SCI_HEADER_PATH += -I M_pot_ar_latch/Mod_LatchControl/inc
-IMPORT_SCI_HEADER_PATH += -I M_pot_ar_latch/inc
+#IMPORT_SCI_HEADER_PATH += -I private/M_pot_ar_latch/Mod_SensorLatch/inc^M
+#IMPORT_SCI_HEADER_PATH += -I private/M_pot_ar_latch/Mod_LatchControl/inc^M
+#IMPORT_SCI_HEADER_PATH += -I private/M_pot_ar_latch/inc^M
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_parameter/Mod_Parameter/inc
IMPORT_SCI_HEADER_PATH += -I $(W_POT_AR_CFG_PATH)/Mod_BusControl/inc
IMPORT_SCI_HEADER_PATH += -I $(W_POT_AR_CFG_PATH)/Mod_MainControl/inc
@@ -238,7 +238,7 @@ LIBRARY_QAC += M_pot_ar_ecu_ab/output/$(PROJECT_NAME)/library/M_pot_ar_ecu_ab_$(
LIBRARY_QAC += M_pot_ar_diagnosis/output/$(PROJECT_NAME)/library/M_pot_ar_diagnosis_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_eol/output/$(PROJECT_NAME)/library/M_pot_ar_eol_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_hmi/output/$(PROJECT_NAME)/library/M_pot_ar_hmi_$(VARIANT).lib
-LIBRARY_QAC += M_pot_ar_latch/output/$(PROJECT_NAME)/library/M_pot_ar_latch_$(LATCH_VARIANT)_$(VARIANT).lib
+#LIBRARY_QAC += library/L_pot_ar_latch/lib/M_pot_ar_latch_$(LATCH_VARIANT)_$(VARIANT).lib^M
LIBRARY_QAC += M_pot_ar_movement/output/$(PROJECT_NAME)/library/M_pot_ar_movement_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_position/output/$(PROJECT_NAME)/library/M_pot_ar_position_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_system/output/$(PROJECT_NAME)/library/M_pot_ar_system_$(VARIANT).lib
@@ -264,7 +264,7 @@ MAKE_QAC   += M_pot_ar_ecu_ab/make/$(ECU_AB_VARIANT)
MAKE_QAC   += M_pot_ar_diagnosis/make/default
MAKE_QAC   += M_pot_ar_eol/make/default
MAKE_QAC   += M_pot_ar_hmi/make/default
-MAKE_QAC   += M_pot_ar_latch/make/$(LATCH_VARIANT)
+#MAKE_QAC   += private/M_pot_ar_latch/make/$(LATCH_VARIANT)^M
MAKE_QAC   += M_pot_ar_movement/make/default
MAKE_QAC   += M_pot_ar_system/make/default
MAKE_QAC   += M_pot_ar_parameter/make/default

modified: make/prj_default/m_project_cfg.mak

no changes added to commit (use "git add" and/or "git commit -a")

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git branch
* develop

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git remote -v
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (fetch)
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (push)
fork ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-kongdel (fetch)
fork ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-kongdel (push)

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git log --stat
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

Makefile                           |   2 +-
make/post_build_cfg.mak            |   4 +-
make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld   | 62 ---------------
make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

Makefile | 1 +
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date: Wed Mar 20 15:30:21 2019 +0530

#266094 : GWM :PG : linker file update to make bootabale

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date: Wed Mar 20 15:30:21 2019 +0530

#266094 : GWM :PG : linker file update to make bootabale

GWM :PG : linker file update to make bootabale

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800

latch magna merge

make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530

#279452 : GWM : PG : Makefile updated for POSTBUILD

GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530

#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

GWM: PG : Makefile fix for QAC and Duplicate macro definition

Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date: Wed Mar 20 15:30:21 2019 +0530

#266094 : GWM :PG : linker file update to make bootabale

GWM :PG : linker file update to make bootabale

make/prj_default/linker_ctrl_file.ld | 8 ++++----
:

git getting started的更多相关文章

Git 子模块 - submodule
有种情况我们经常会遇到:某个工作中的项目需要包含并使用另一个项目. 也许是第三方库,或者你独立开发的,用于多个父项目的库. 现在问题来了:你想要把它们当做两个独立的项目,同时又想在一个项目中使用另 ...
Git 在团队中的最佳实践--如何正确使用Git Flow
我们已经从SVN 切换到Git很多年了,现在几乎所有的项目都在使用Github管理, 本篇文章讲一下为什么使用Git, 以及如何在团队中正确使用. Git的优点 Git的优点很多,但是这里只列出我认为 ...
Git与Repo入门
版本控制版本控制是什么已不用在说了,就是记录我们对文件.目录或工程等的修改历史,方便查看更改历史,备份以便恢复以前的版本,多人协作... 一.原始版本控制最原始的版本控制是纯手工的版本控制:修改文 ...
Git Bash的一些命令和配置
查看git版本号: git --version 如果是第一次使用Git,你需要设置署名和邮箱: $ git config --global user.name "用户名" $ gi ...
在Ubuntu 16.10 安装 git 并上传代码至 git.oschina.net
1. 注册一个账号和创建项目先在git.oschina.net上注册一个账号和新建一个project ,如project name 是"myTest". 2.安装git sudo ...
史上最详细git教程
题外话虽然这个标题很惊悚,不过还是把你骗进来了,哈哈-各位看官不要着急,耐心往下看 Git是什么 Git是目前世界上最先进的分布式版本控制系统. SVN与Git的最主要的区别 SVN是集中式版本控制 ...
[版本控制之道] Git 常用的命令总结（欢迎收藏备用）
坚持每天学习,坚持每天复习,技术永远学不完,自己永远要前进总结日常开发生产中常用的Git版本控制命令 ------------------------------main-------------- ...
【解决方案】Myeclipse 10 安装 GIT 插件集成步骤图解
工程开发中,往往要使用到集成GIT ,那么下面说说插件安装步骤 PS:以Myeclipse 10 为例,讲解集成安装步骤. ----------------------main------------ ...
git 命令
切换仓库地址: git remote set-url origin xxx.git切换分支:git checkout name撤销修改:git checkout -- file删除文件:git rm ...
git亲测命令
一.Git新建本地分支与远程分支关联问题 git checkout -b branch_name origin/branch_name 或者 git branch --set-upstream bra ...

随机推荐

vue ie
http://www.jb51.net/article/118792.htm https://blog.csdn.net/landl_ww/article/details/79149461 解决安装 ...
vue中连续点击3次且时间间隔不超过3秒，才显示div（刚开始隐藏的）
num:0,//点击次数timer0:'',//第一次点击的时间timer4:'',//第四次点击的时间centerDialogVisible: false // 连续4次点击显示模态框 change ...
pyCharm编辑器激活使用
1.打开激活窗口 2.选择 Activate new license with License server (用license server 激活) 3.在 License sever addres ...
使用sqlite3解决IDEA中SVN更新提示cleanup却无法cleanup的问题
用idea开发项目,更新svn有时莫名其妙的出现 Error:Error performing cleanup for 'D:\SourceProject\XXXX': svn: E155004: T ...
Mysql8.0.11安装以及注意事项
一.环境配置首先在官网下载最新的mysql8.0.11数据库,解压到你需要放置的盘符最好不要有中文,然后新建MYSQL_HOME,参数为mysql解压后安装文件的bin文件路径如我的:变量名:MYS ...
并查集（disjoint）
合并,查找的集合第一,建立两个函数,一个用来查找(find),一个用来合并(merge): 如下的一个模板: 题目: 亲戚(Relations) 或许你并不知道,你的某个朋友是你的亲戚.他可能是你的 ...
Python记录7：函数3，函数对象
#函数对象指的是:函数的内存地址可以像变量值一样去使用,如何使用?def func(): print('from func')#1. 可以被引用# f=func# print(f)# f() #2. ...
十二总结JS原型
基本概念: 对象:属性和方法的集合(变量和函数的封装). 构造器函数:用于创建对象的函数,通过new关键字生成对象.函数名一般首字母大写的. 原型对象:每个函数都有一个prototype属性,它是一个 ...
学习笔记<4>初步控件布局
一.控件布局基本概念指控制控件在Activity当中的位置.大小.颜色以及其他控件样式属性二.控件布局两种方法 1.使用布局文件完成控件布局(eclipse可视化拖拽控件实现) 2.在JAVA代码 ...
Codeforces Round #322 (Div. 2) E F
E. Kojiro and Furrari 题意说的是在一条直线上有n个加油站, 每加一单位体积的汽油可以走1km 然后每个加油站只有一种类型的汽油,汽油的种类有3种求从起点出发到达终点要求使 ...

git getting started

git getting started的更多相关文章

随机推荐

热门专题