本地資源庫升級

前段時間我安裝我的服務器上Galaxy應用。由於有新的版本，我想升級它，我用命令：本地資源庫升級

git checkout release_17.05 && git pull --ff-only origin release_17.05

但我得到的錯誤信息：

Already on 'release_17.05' 
From https://github.com/galaxyproject/galaxy 
* branch   release_17.05 -> FETCH_HEAD 
Updating 5a97b8f..9dca211 
error: Your local changes to the following files would be overwritten by merge: 
     .ci/first_startup.sh 
     .ci/flake8_blacklist.txt 
     .ci/py3_sources.txt 
     ........

如果我做的git的狀態：

On branch release_17.05 Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) 

     modified: .ci/check_controller.sh 
     modified: .ci/check_mako.sh 
     modified: .ci/first_startup.sh 
     modified: .ci/flake8_blacklist.txt 
     modified: .ci/py3_sources.txt 
     modified: .coveragerc 
     modified: .gitignore 
     modified: .travis.yml 
     .... 
     Untracked files: 
     (use "git add <file>..." to include in what will be committed) 

     FETCH_HEAD 
     config/plugins/interactive_environments/jupyter/config/allowed_images.yml 
     config/plugins/interactive_environments/rstudio/config/allowed_images.yml 
     current_files.summary 
     file_list.txt 
     static/CDAworkflow.html 
     static/CDAworkflow.xml 
     static/Capture.PNG 
     static/Einladung_Galaxy_03_04_2017.pdf 
     static/FTP.pdf 
     static/Homo_sapiens.GRCh38.86.gtf 
     ...... 
     no changes added to commit (use "git add" and/or "git commit -a")

我問題是我應該在升級之前執行哪一步？我應該怎麼辦git add -A && git commit第一，比git pull也許更好git stash，git pull和git stash pop ???我只知道git基礎知識，因此我不確定我應該先執行哪一步？

感謝，Marija的

來源

2017-07-05 Marija

做git stash是一個很好的選擇！諮詢

git stash   # saving your current working directory to the top of stash 
git checkout release_17.05 && git pull --ff-only origin release_17.05 
git stash apply  # getting back your changes previously stashed

來源

2017-07-05 11:37:03

感謝您：您可以執行這些命令！ – Marija

本地資源庫升級

回答

相關問題