老鐵，這年頭不會點Git真不行！！！

畢業論文_初稿.doc

畢業論文_修改1.doc

畢業論文_修改2.doc

畢業論文_修改3.doc

畢業論文_完整版1.doc

畢業論文_完整版2.doc

畢業論文_完整版3.doc

畢業論文_最終版1.doc

畢業論文_最終版2.doc

畢業論文_死也不改版.doc

...

MacBook-Pro-4:pondo wupeiqi$ ls

app01       db.sqlite3  manage.py   pondo       static      templates

MacBook-Pro-4:pondo wupeiqi$ git init

Initialized empty Git repository in /Users/wupeiqi/PycharmProjects/pondo/.git/

MacBook-Pro-4:pondo wupeiqi$ git config --local user.name '武沛齊'

MacBook-Pro-4:pondo wupeiqi$ git config --local user.email '[email protected]'

MacBook-Pro-4:pondo wupeiqi$ git add .

MacBook-Pro-4:pondo wupeiqi$ git commit -m '專案首次移植到Git控制版本'

[master (root-commit) 6c439d2] 專案首次移植到Git控制版本

 32 files changed, 870 insertions(+)

 create mode 100644 .idea/dictionaries/wupeiqi.xml

 create mode 100644 .idea/encodings.xml

 ...

MacBook-Pro-4:pondo wupeiqi$ git status            # 非洲專區功能的開發，僅對app01/views.py進行了修改

On branch master

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:   app01/views.py

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

MacBook-Pro-4:pondo wupeiqi$ git add .

MacBook-Pro-4:pondo wupeiqi$ git commit -m '非洲專區上線'

[master 0972f4b] 非洲專區上線

 1 file changed, 3 insertions(+), 1 deletion(-)

MacBook-Pro-4:pondo wupeiqi$

MacBook-Pro-4:pondo wupeiqi$ git log

commit 0972f4bb43104baee15aeec2dd62bd0a307ec837

Author: 武沛齊 <[email protected]>

Date:   Fri Aug 11 10:54:42 2017 +0800

    非洲專區上線

commit 6c439d2fd0d943f36f3ee84e158ff86b052961d2

Author: 武沛齊 <[email protected]>

Date:   Fri Aug 11 10:42:09 2017 +0800

    專案首次移植到Git控制版本

MacBook-Pro-4:pondo wupeiqi$ git reset --hard 6c439d2fd0d943f36f3ee84e158ff86b052961d2

HEAD is now at 6c439d2 專案首次移植到Git控制版本

# 命令執行完，工作區的所有檔案就變成未開發非洲專區功能之前了，太爽了有麼有....

MacBook-Pro-4:pondo wupeiqi$ git reflog

6c439d2 HEAD@{2}: reset: moving to 6c439d2fd0d943f36f3ee84e158ff86b052961d2

0972f4b HEAD@{3}: commit: 非洲專區上線

6c439d2 HEAD@{4}: commit (initial): 專案首次移植到Git控制版本

MacBook-Pro-4:pondo wupeiqi$ git reset --hard 0972f4b

HEAD is now at 0972f4b 非洲專區上線

acBook-Pro-4:pondo wupeiqi$ vim app01/views.py             # 開發直播功能，剛開發到一半

MacBook-Pro-4:pondo wupeiqi$ git status

On branch master

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:   app01/views.py

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

MacBook-Pro-4:pondo wupeiqi$ git stash                     # 將開發到一半的直播功能，臨時儲存到“某個地方”

Saved working directory and index state WIP on master: 0972f4b 非洲專區上線

HEAD is now at 0972f4b 非洲專區上線

MacBook-Pro-4:pondo wupeiqi$ git status                    # 工作區回到當前版本未做任何操作前

On branch master

nothing to commit, working tree clean

MacBook-Pro-4:pondo wupeiqi$ vim pondo/settings.py         # 緊急修復bug

MacBook-Pro-4:pondo wupeiqi$ git status

On branch master

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:   pondo/settings.py

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

MacBook-Pro-4:pondo wupeiqi$ git add .                     # 新增到修改bug的程式碼到暫存狀態

MacBook-Pro-4:pondo wupeiqi$ git commit -m '緊急修復bug'     # 提交修復Bug的程式碼到分支

[master 1300d33] 緊急修復bug

 1 file changed, 1 insertion(+)

MacBook-Pro-4:pondo wupeiqi$ git stash pop                 # 將開發到一半的直播功能從“某個地方”再次拿會工作區繼續開發

On branch master

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:   app01/views.py

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

Dropped refs/stash@{0} (059d78ca8fa204f9559bd3ce0ae76235969b4301)

a. 原來內容：

    from django.shortcuts import render,HttpResponse

    def index(request):

        return render(request,'index.html')

    def africa(request):

        return HttpResponse('非洲專區')

b. 開發到一半直播功能：

    from django.shortcuts import render,HttpResponse

    def index(request):

        return render(request,'index.html')

    def africa(request):

        return HttpResponse('非洲專區')

    def live(request):

        print('開發到一半')

        return HttpResponse('....')

c. 執行git stash，回到當前版本未修改狀態:

    from django.shortcuts import render,HttpResponse

    def index(request):

        return render(request,'index.html')

    def africa(request):

        return HttpResponse('非洲專區')

d. 修復Bug並提交：

    from django.shortcuts import render,HttpResponse

    def index(request):

        return render(request,'index.html')

    def africa(request):

        return HttpResponse('非洲xxxxx專區')

e. 繼續開發直播功能 git stash pop，此時會出現衝突：

    MacBook-Pro-:pondo wupeiqi$ git stash pop

    Auto-merging app01/views.py

    CONFLICT (content): Merge conflict in app01/views.py

    表示app01/views.py存在衝突需要解決，此時檔案內容為：

    from django.shortcuts import render,HttpResponse

        def index(request):

            return render(request,'index.html')

        def africa(request):

        <<<<<<< Updated upstream：               # 修復Bug時更改的內容

            return HttpResponse('非洲xxxx區')

        =======                                  # 修復Bug前正在開發新功能時的內容

            return HttpResponse('非洲專區')

        def live(request):

            print('剛開發到一半')

            return HttpResponse('直播功能')

        >>>>>>> Stashed changes

    需要自行解決衝突，然後繼續開發，如：

    from django.shortcuts import render,HttpResponse

        def index(request):

            return render(request,'index.html')

        def africa(request):

            return HttpResponse('非洲xxxx區')  

        def live(request):

            print('剛開發到一半')

            return HttpResponse('直播功能')
        

git stash pop 出現衝突

MacBook-Pro-4:pondo wupeiqi$ git branch                     # 當前在master分支

* master

MacBook-Pro-4:pondo wupeiqi$ git branch dev                 # 建立dev分支用於開發新功能

MacBook-Pro-4:pondo wupeiqi$ git checkout dev               # 切換到dev分支

Switched to branch 'dev'

MacBook-Pro-4:pondo wupeiqi$ vim app01/views.py             # 開發新功能到一半，需要緊急修復Bug

MacBook-Pro-4:pondo wupeiqi$ git add .

MacBook-Pro-4:pondo wupeiqi$ git commit -m '新功能開發一半'

[dev b3ac2cb] 新功能開發一半

 1 file changed, 2 insertions(+)

MacBook-Pro-4:pondo wupeiqi$ git checkout master            # 切換回master分支

Switched to branch 'master'

MacBook-Pro-4:pondo wupeiqi$ git branch bug                 # 建立bug分支

MacBook-Pro-4:pondo wupeiqi$ git checkout bug               # 切換到bug分支

Switched to branch 'bug'

MacBook-Pro-4:pondo wupeiqi$ vim pondo/settings.py          # 修改bug

MacBook-Pro-4:pondo wupeiqi$ git add .                      # 提交bug

MacBook-Pro-4:pondo wupeiqi$ git commit -m '緊急修復bug'      # 提交bug

[bug f42f386] 緊急修復bug

 1 file changed, 1 insertion(+), 1 deletion(-)

MacBook-Pro-4:pondo wupeiqi$ git checkout master            # 切換會master

Switched to branch 'master'

MacBook-Pro-4:pondo wupeiqi$ git merge bug                  # 將bug分支內容合併到master分支，表示bug修復完畢，可以上線

Updating 0972f4b..f42f386

Fast-forward

 pondo/settings.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

MacBook-Pro-4:pondo wupeiqi$ git checkout dev               # 切換到dev分支，繼續開發新功能

Switched to branch 'dev'

MacBook-Pro-4:pondo wupeiqi$ vim app01/views.py             # 繼續開發其他一半功能

MacBook-Pro-4:pondo wupeiqi$ git add .                      # 提交新功能

MacBook-Pro-4:pondo wupeiqi$ git commit -m '繼續開發完成'      # 提交功能

[dev c0bfb27] 繼續開發完成

 1 file changed, 1 insertion(+)

MacBook-Pro-4:pondo wupeiqi$ git checkout master            # 切換回master分支

Switched to branch 'master'

MacBook-Pro-4:pondo wupeiqi$ git merge dev                  # 將dev分支合併到master分支

Merge made by the 'recursive' strategy.

 app01/views.py | 3 +++

 1 file changed, 3 insertions(+)

MacBook-Pro-4:pondo wupeiqi$ git remote add origin https://github.com/WuPeiqi/pondo.git   # 為地址起一個別名origin

MacBook-Pro-4:pondo wupeiqi$ git push origin master              # 將本地master分支內容以及版本資訊推送到GitHub

Username for 'https://github.com':                               # 輸入GitHub使用者名稱

Password for 'https://[email protected]':                       # 輸入GitHub密碼

Counting objects: 2, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (2/2), done.

Writing objects: 100% (2/2), 270 bytes | 0 bytes/s, done.

Total 2 (delta 1), reused 0 (delta 0)

remote: Resolving deltas: 100% (1/1), completed with 1 local object.

To https://github.com/WuPeiqi/pondo.git

   634aac4..274f1e4  master -> master

MacBook-Pro-4:pondo wupeiqi$ git push origin dev              # 將本地dev分支內容以及版本資訊推送到GitHub

Counting objects: 3, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (2/2), done.

Writing objects: 100% (3/3), 261 bytes | 0 bytes/s, done.

Total 3 (delta 1), reused 0 (delta 0)

remote: Resolving deltas: 100% (1/1), completed with 1 local object.

To https://github.com/WuPeiqi/pondo.git

   274f1e4..50e2169  dev -> dev

MacBook-Pro-4:github wupeiqi$ git clone https://github.com/WuPeiqi/pondo.git    # 將專案從GitHub中獲取

Cloning into 'pondo'...

remote: Counting objects: 31, done.

remote: Compressing objects: 100% (26/26), done.

remote: Total 31 (delta 2), reused 30 (delta 1), pack-reused 0

Unpacking objects: 100% (31/31), done.

MacBook-Pro-4:github wupeiqi$ cd pondo/

MacBook-Pro-4:pondo wupeiqi$ git Branch                                          # 預設獲取到得只有master分支

* master

MacBook-Pro-4:pondo wupeiqi$ git branch dev origin/dev                           # 建立dev分支且和遠端dev分支同步

Branch dev set up to track remote branch dev from origin.

MacBook-Pro-4:pondo wupeiqi$ git checkout dev                                    # 切換到dev分支

Switched to branch 'dev'

MacBook-Pro-4:pondo wupeiqi$ vim app01/views.py                                  # 繼續開發新功能

MacBook-Pro-4:pondo wupeiqi$ git add .                                           # 新增檔案到版本庫的暫存狀態

MacBook-Pro-4:pondo wupeiqi$ git commit -m '公司開發功能1'                         # 提交新功能到版本庫的分支

[dev 9281447] 公司開發功能1

 1 file changed, 1 insertion(+), 1 deletion(-)

MacBook-Pro-4:pondo wupeiqi$ git push origin dev                                 # 提交dev分支內容到遠端GitHub託管倉庫的dev分支

Username for 'https://github.com': wupeiqi

Password for 'https://[email protected]':

Counting objects: 4, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (4/4), done.

Writing objects: 100% (4/4), 427 bytes | 0 bytes/s, done.

Total 4 (delta 2), reused 0 (delta 0)

remote: Resolving deltas: 100% (2/2), completed with 2 local objects.

To https://github.com/WuPeiqi/pondo.git

   50e2169..9281447  dev -> dev

MacBook-Pro-4:pondo wupeiqi$ git checkout dev                                   # 切換到dev分支

Already on 'dev'

MacBook-Pro-4:pondo wupeiqi$ git pull origin dev                                # 從遠端GitHub倉庫獲取dev分支最新內容，併合併到本地

remote: Counting objects: 4, done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 4 (delta 2), reused 4 (delta 2), pack-reused 0

Unpacking objects: 100% (4/4), done.

From https://github.com/WuPeiqi/pondo

 * branch            dev        -> FETCH_HEAD

   50e2169..9281447  dev        -> origin/dev

Updating 50e2169..9281447

Fast-forward

 app01/views.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

 MacBook-Pro-4:pondo wupeiqi$ vim app01/views.py                                # 繼續開發新功能

 MacBook-Pro-4:pondo wupeiqi$ git add .                                         # 新增檔案到版本庫的暫存狀態

MacBook-Pro-4:pondo wupeiqi$ git commit -m '家裡開發功能1'                        # 提交新功能到版本庫的分支

MacBook-Pro-4:pondo wupeiqi$ git checkout dev                                   # 切換到dev分支

MacBook-Pro-4:pondo wupeiqi$ git fetch origin dev                               # 從GitHub倉庫獲取dev分支最新內容到版本庫的分支

remote: Counting objects: 3, done.

remote: Compressing objects: 100% (1/1), done.

remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0

Unpacking objects: 100% (3/3), done.

From https://github.com/WuPeiqi/pondo

 * branch            dev        -> FETCH_HEAD

   150d891..65b6604  dev        -> origin/dev

MacBook-Pro-4:pondo wupeiqi$ git merge origin/dev                               # 將版本庫的分支內容合併到工作區

Updating 150d891..65b6604

Fast-forward

 readme | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

MacBook-Pro-4:pondo wupeiqi$ vim app01/views.py                                 # 繼續開發新功能

MacBook-Pro-4:pondo wupeiqi$ git add .                                          # 新增檔案到版本庫的暫存狀態

MacBook-Pro-4:pondo wupeiqi$ git commit -m 'xxxxxxxxxxx'                        # 提交新功能到版本庫的分支

　　以斜槓“/”開頭表示目錄；

　　以星號“*”通配多個字元；

　　以問號“?”通配單個字元

　　以方括號“[]”包含單個字元的匹配列表；

　　以歎號“!”表示不忽略(跟蹤)匹配到的檔案或目錄；

.gitignore

    git tag -a v1.0 -m '版本介紹'        本地建立Tag

    git show v1.0                       檢視

    git tags -n                         檢視本地Tag

    git tag -l 'v1.4.2.*'               檢視本地Tag，模糊匹配

    git tag -d v1.0                     刪除Tag

    git push origin :refs/tags/v0.2     更新遠端tag

    git checkout v.10                   切換tag

    git fetch origin tag V1.2

    git push origin  --tags

    git pull origin  --tags

    git clone -b v0.1

版本相關

# Byte-compiled / optimized / DLL files

# pycharm

.idea/

.DS_Store

offline-script/

media/

# database migrations

*/migrations/*.py

!*/migrations/__init__.py

__pycache__/

*.py[cod]

*$py.class

# Django stuff:

*.log

local_settings.py

*.sqlite3

# C extensions

*.so

# Distribution / packaging

.Python

build/

develop-eggs/

dist/

downloads/

eggs/

.eggs/

lib/

lib64/

parts/

sdist/

var/

wheels/

*.egg-info/

.installed.cfg

*.egg

MANIFEST

# PyInstaller

#  Usually these files are written by a python script from a template

#  before PyInstaller builds the exe, so as to inject date/other infos into it.

*.manifest

*.spec

# Installer logs

pip-log.txt

pip-delete-this-directory.txt

# Unit test / coverage reports

htmlcov/

.tox/

.coverage

.coverage.*

.cache

nosetests.xml

coverage.xml

*.cover

.hypothesis/

.pytest_cache/

# Translations

*.mo

*.pot

# Flask stuff:

instance/

.webassets-cache

# Scrapy stuff:

.scrapy

# Sphinx documentation

docs/_build/

# PyBuilder

target/

# Jupyter Notebook

.ipynb_checkpoints

# IPython

profile_default/

ipython_config.py

# pyenv

.python-version

# celery beat schedule file

celerybeat-schedule

# SageMath parsed files

*.sage.py

# Environments

.env

.venv

env/

venv/

ENV/

env.bak/

venv.bak/

# Spyder project settings

.spyderproject

.spyproject

# Rope project settings

.ropeproject

# mkdocs documentation

/site

# mypy

.mypy_cache/

.dmypy.json

dmypy.json