当执行 git remote add 时 ， 出现
fatal: remote origin already exists
错误
解决方法 ， 改为： git remote add origin https://gitlab.com/projectname
push flutter 项目时， 出现 both modified: .idea/workspace.xml 错误
此文件不上传也可以， 所以解决方法是在git仓库把它去掉
1 先在git 缓存删除 ：
|
1 |
git rm -r --cached .idea |
2 再把 idea 文件夹加到 gitignore
|
1 |
adding /.idea to .gitignore |
解决方法来源： http://stackoverflow.com/questions/57091527/what-exactly-is-idea-workspace-xml
How to gitlab cl cd
To use GitLab CI/CD, all you need is an application codebase hosted in a Git repository, and for your build, test, and deployment scripts to be specified in a file called .gitlab-ci.yml, located in the root path of your repository.
需要写 gitlab-ci.yml 文件 来描述如何自动化 ci , cd
Once you’ve added your .gitlab-ci.yml configuration file to your repository, GitLab will detect it and run your scripts with the tool called GitLab Runner, which works similarly to your terminal.
写完以后用 gitlab runner 来执行 yml 文件
Use remote version override local existing one
|
1 2 3 |
git fetch --all |
|
1 |
git reset --hard origin/master |
reference from :
https://stackoverflow.com/questions/1125968/how-do-i-force-git-pull-to-overwrite-local-files
git tips
git clone -b my-branch https://git@github.com/username/myproject.git
git push origin branch_name —- 更新本地update to remote
git pull origin branch name — 取远程其他人的更新
git stash —- 放弃本地更新
找出2次 commit 的区别
Use git log to view the commit history. Each commit has an associated revision specifier that is a hash key (e.g. 14b8d0982044b0c49f7a855e396206ee65c0e787 and b410ad4619d296f9d37f0db3d0ff5b9066838b39). To view the difference between two different commits, use git diff with the first few characters of the revision specifiers of both commits, like so:
|
1 2 3 4 5 |
# diff between commits 14b8... and b410... git diff 14b8..b410 # only include diff of specified files git diff 14b8..b410 path/to/file/a path/to/file/b |
If you want to get an overview over all the differences that happened from commit to commit, use git log or git whatchanged with the patch option:
|
1 2 3 4 5 6 7 |
# include patch displays in the commit history git log -p git whatchanged -p # only get history of those commits that touch specified paths git log path/a path/b git whatchanged path/c path/d |
参见 ： https://stackoverflow.com/questions/1786027/how-to-view-file-history-in-git
How to add local code to github
- Create a new repository on GitHub. You can also add a gitignore file, a readme and a licence if you want
- Open Git Bash
- Change the current working directory to your local project.
- Initialize the local directory as a Git repository.
git init
- Add the files in your new local repository. This stages them for the first commit.
git add .
- Commit the files that you’ve staged in your local repository.
git commit -m "initial commit"
- Copy the https url of your newly created repo
- In the Command prompt, add the URL for the remote repository where your local repository will be pushed.
git remote add origin remote repository URL
git remote -v
- Push the changes in your local repository to GitHub.
git push -f origin master
如果遇到错误 ： remote origin already exist ,
|
1 2 3 4 5 6 |
You already have a remote named origin (the one you cloned from). Just give the new remote a different name and you should be OK: $ git remote add another_origin git@github.com:RiyaKapuria/testing.git and then push to the another_origin by executing git push -u another_origin master |