• 欢迎访问IT乐园(o゚▽゚)o
  • 推荐使用最新版火狐浏览器和Chrome浏览器访问本网站。

Git Protocol

代码 fhy 1年前 (2017-03-13) 659次浏览 0个评论 扫描二维码
文章目录[隐藏]

A guide for programming within version control.

Thank Ruanyifeng
thoughtbot

Maintain a Repo

  • Avoid including files in source control that are specific to your
    development machine or process.
  • Delete local and remote feature branches after merging.
  • Perform work in a feature branch.
  • Rebase frequently to incorporate upstream changes.
  • Use a pull request for code reviews.

Write a Feature

Create a local feature branch based off master.

git checkout master
git pull
git checkout -b

Rebase frequently to incorporate upstream changes.

git fetch origin
git rebase origin/master

Resolve conflicts. When feature is complete and tests pass, stage the changes.

git add –all

When you’ve staged the changes, commit them.

git status
git commit –verbose

Write a good commit message. Example format:

Present-tense summary under 50 characters

  • More information about commit (under 72 characters).
  • More information about commit (under 72 characters).

http://project.management-system.com/ticket/123

If you’ve created more than one commit,
use git rebase interactively
to squash them into cohesive commits with good messages:

git rebase -i origin/master

Share your branch.

git push origin

Submit a GitHub pull request.

Ask for a code review in the project’s chat room.

Review Code

A team member other than the author reviews the pull request. They follow
Code Review guidelines to avoid
miscommunication.

They make comments and ask questions directly on lines of code in the GitHub
web interface or in the project’s chat room.

For changes which they can make themselves, they check out the branch.

git checkout ./bin/setup
git diff staging/master..HEAD

They make small changes right in the branch, test the feature on their machine,
run tests, commit, and push.

When satisfied, they comment on the pull request Ready to merge.

Merge

Rebase interactively. Squash commits like “Fix whitespace” into one or a
small number of valuable commit(s). Edit commit messages to reveal intent. Run
tests.

git fetch origin
git rebase -i origin/master

Force push your branch. This allows GitHub to automatically close your pull
request and mark it as merged when your commit(s) are pushed to master. It also
makes it possible to find the pull request that brought in your changes.

git push –force-with-lease origin

View a list of new commits. View changed files. Merge branch into master.

git log origin/master.. git diff –stat origin/master
git checkout master
git merge –ff-only
git push

Delete your remote feature branch.

git push origin –delete

Delete your local feature branch.

git branch –delete


IT 乐园 , 版权所有丨如未注明 , 均为原创丨本网站采用BY-NC-SA协议进行授权
转载请注明原文链接:Git Protocol
喜欢 (0)
关于作者:
九零后挨踢男
发表我的评论
取消评论
表情 贴图 加粗 删除线 居中 斜体 签到

Hi,您需要填写昵称和邮箱!

  • 昵称 (必填)
  • 邮箱 (必填)
  • 网址