mirror of
https://github.com/LCTT/TranslateProject.git
synced 2025-03-30 02:40:11 +08:00
[translating by firmianay]20170818 How to recover from a git mistake.md (#5988)
* translate finished * translating by firmianay
This commit is contained in:
Firmy Yang
Ezio
parent
edcaa68efe
commit
7059790378
@ -1,3 +1,5 @@
|
||||
Translating by firmianay
|
||||
|
||||
How to recover from a git mistake
|
||||
============================================================
|
||||
|
||||
|
||||
@ -1,121 +0,0 @@
|
||||
Translating by firmianay
|
||||
|
||||
### [Getting Started With GitHub][11]
|
||||
|
||||
|
||||
[][1]
|
||||
|
||||
[Github][13] is an online platform built to promote code hosting, version control and collaboration among individuals working on a common project. Projects can be handled from anywhere through the platform. (Hosting and reviewing code, managing projects and building software with other developers around the world) **The GitHub platform** offers project handling to both open-source and private projects. Features offered in regards to team project handling include; **GitHub** Flow and GitHub Pages. These functions make it easy for teams with regular deployments to in handling the workflow. GitHub pages, on the other hand, provides a place for showcasing open source projects, displaying resumes, hosting blogs among others.
|
||||
|
||||
Individual projects can also be easily handled with the aid of GitHub as it provides essential tools for projects handling. It also makes it easier to share one's project with the world.
|
||||
|
||||
### Signing Up for GitHub and Starting a Project
|
||||
|
||||
When starting a new project on GitHub, you must first create an account here using your email address.
|
||||
[][2] Then, on verification of the address, the user will be automatically logged into their GitHub account.
|
||||
|
||||
#### 1\. Creating a Repository
|
||||
|
||||
After which, one is taken to the next page that allows for the creation of a repository. A repository is a storage for all project files including revision history. Repositories are either, public or private. Public repositories are visible to everyone, however, the owner chooses an individual who can commit to the project. On the other hand, private <u>repositories</u> provide extra control to who can view the repositories. As a result, public repositories are suitable for open source software projects while private repositories are mostly suited to private or closed source projects.
|
||||
|
||||
* After filling the “Repository Name” and filling the “Short Description”
|
||||
|
||||
* Check the “Initialize this repository with a README”.
|
||||
|
||||
* Finally, click the “Create Repository” button at the bottom.
|
||||
|
||||
[][3]
|
||||
|
||||
#### 2\. Adding a Branch
|
||||
|
||||
In _GitHub_ , branches are a way of working on various versions of a single repository simultaneously. By default, any single repository created is assigned a branch called MASTER and it is considered the final branch. In GitHub, branches are useful in experimenting and editing of repositories before committing them to the master (Final branch).
|
||||
|
||||
For personal suitability, it is always necessary to add several other branches to suit different projects. Creating a branch off the master branch is the same as copying the master as it was at that instant. [][4] Creating branches is similar to saving a single file in different versions. This is achieved by renaming according to the task being carried out on a particular repository.
|
||||
|
||||
Branches also prove useful in keeping bug fixes and feature work separated from the master branch. After necessary changes, these branches are merged into the master branch.
|
||||
|
||||
To make a branch after creating the repository;
|
||||
|
||||
* Go to your new repository by clicking on the repository name in this case, “Hello-World”.
|
||||
|
||||
* Click on the “Branch-Master” button at the top to see a drop-down menu with a blank field for filling the branch name.
|
||||
|
||||
* Enter the branch name, in this case, ”readme-edits”.
|
||||
|
||||
* Press “Enter” or click on the blue “create- branch” box
|
||||
|
||||
By now two branches have been created; master and readme-edits.
|
||||
|
||||
#### 3\. Making and Committing Changes
|
||||
|
||||
This step provides guidelines on how changes are made to a repository and saved. In GitHub, commits is the word used to refer to saved changes. Each commit is also associated with a commit message that contains a history of the saved changes and why particular changes were made. This makes it easy for other contributors to follow what was done and why.
|
||||
To make and commit changes to a repository, the following are the steps;
|
||||
|
||||
* Click on the repository name “Hello-World”.
|
||||
|
||||
* To view and edit the file, click on the pencil icon in the upper right corner.
|
||||
|
||||
[][5]
|
||||
|
||||
* In the editor, write something to ascertain that you can make changes.
|
||||
|
||||
* Write briefly in the commit message field to explain why and how the changes were made.
|
||||
|
||||
* Click on commit changes button to save the changes.
|
||||
|
||||
Please note that these changes only affect the readme-edits branch and not the master branch. [][6]
|
||||
|
||||
#### 4\. Opening a Pull Request
|
||||
|
||||
Pull request is a feature that allows a contributor to propose and request someone to review and merge certain changes to their branch. Pull requests also show the difference (diffs) from several branches. Changes, additions, and subtractions are usually shown in red and green colors. Pull requests can be started as soon as a commit is made. Even when the code is not finished.
|
||||
To open a pull request:
|
||||
|
||||
* Click the pull request tab.
|
||||
|
||||
* Select the readme-edits branch to compare with the master.
|
||||
|
||||
* Determine the requirements and be sure it is what you want to submit.
|
||||
|
||||
* Click on the create pull request green button and assign it a title.
|
||||
|
||||
* Press enter.
|
||||
|
||||
[][7] [][8] [][9] The user can demonstrate this by trying to create and saving a pull request.
|
||||
|
||||
#### 5\. Merging the Pull Request
|
||||
|
||||
This final step involves bringing readme-edits and master branches together. The merge Pull button shows up in case the readme-edits and the master branch do not conflict.
|
||||
[][10] When merging pulls, there is need to ensure that the comments and other fields are filled properly. To merge pulls:
|
||||
|
||||
* Click on the merge pull request button.
|
||||
|
||||
* Confirm the merge.
|
||||
|
||||
* Press the purple delete branch button to delete the readme-edits branch since it is already incorporated in the master.
|
||||
|
||||
This article provides a simple guideline to getting started with GitHub and other basic operations of the GitHub platform.
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: http://www.linuxandubuntu.com/home/getting-started-with-github
|
||||
|
||||
作者：[LinuxAndUbuntu][a]
|
||||
译者：[译者ID](https://github.com/译者ID)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]:http://www.linuxandubuntu.com
|
||||
[1]:http://www.linuxandubuntu.com/home/getting-started-with-github
|
||||
[2]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/github-homepage_orig.jpg
|
||||
[3]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/create-a-github-repository_orig.jpg
|
||||
[4]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/add-a-branch-to-github-repository_orig.jpg
|
||||
[5]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/commit-changes-to-github-repository_orig.jpg
|
||||
[6]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/commit-branch-to-master_orig.jpg
|
||||
[7]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/github-pull-request_orig.jpg
|
||||
[8]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/compare-commit-changes-github_orig.jpg
|
||||
[9]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/open-a-pull-request-in-github-repository_orig.jpg
|
||||
[10]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/merge-the-pull-request-github_orig.jpg
|
||||
[11]:http://www.linuxandubuntu.com/home/getting-started-with-github
|
||||
[12]:http://www.linuxandubuntu.com/home/getting-started-with-github#comments
|
||||
[13]:https://github.com/
|
||||
139
translated/tech/20170822 Getting Started With GitHub.md
Normal file
139
translated/tech/20170822 Getting Started With GitHub.md
Normal file
@ -0,0 +1,139 @@
|
||||
### [GitHub 入门][11]
|
||||
|
||||
|
||||
[][1]
|
||||
|
||||
[Github][13] 是一个在线平台，旨在促进在一个共同项目上工作的个人之间的代码托管、版本控制和协作。通过该平台，无论何时何地，都可以对项目进行操作。（托管和审查代码，管理项目和与世界各地的其他开发者共同开发软件）**GitHub 平台**为开源项目和私人项目都提供了项目处理功能。关于团队项目处理的功能包括：GitHub 流和 GitHub 页。这些功能可以让需要定期部署的团队轻松处理工作流程。另一方面，GitHub 页提供了页面用于展示开源项目，展示简历，托管博客等。
|
||||
|
||||
GitHub 也为个人项目提供了必要的工具，使得个人项目可以轻松地处理。它也使得个人可以更轻松地与世界分享他们的项目。
|
||||
|
||||
### 注册 GitHub 并启动一个项目
|
||||
|
||||
在 GitHub 上启动新项目时，您必须先使用您的电子邮件地址创建一个帐户。
|
||||
|
||||
[][2]
|
||||
|
||||
然后，在验证邮箱的时候，用户将自动登录到他们的 GitHub 帐户。
|
||||
|
||||
#### 1\. 创建仓库
|
||||
|
||||
之后，我们会被带到一个用于创建仓库的页面。一个仓库是对所有项目文件包括修订历史记录的存储。一个仓库可以是公开的或者是私有的。公开的仓库可以被任何人查看，但是，只有项目所有者授予权限的人才可以提交修改到这个仓库。另一方面，私有仓库提供了额外的控制，可以将项目设置为对谁可见。因此，公开仓库适用于开源软件项目，而私有仓库主要适用于私有或闭源项目。
|
||||
|
||||
* 填写 “Repository Name” 和 “Short Description”。
|
||||
|
||||
* 选中 “Initialize this repository with a README”。
|
||||
|
||||
* 最后，点击底部的 “Create Repository” 按钮。
|
||||
|
||||
[][3]
|
||||
|
||||
#### 2\. 添加分支
|
||||
|
||||
在 GitHub 中，分支是一种同时操作单个仓库的各种版本的方式。默认情况下，任何创建的单个仓库都会被分配一个名为 “MASTER” 的分支，它被认为是最后一个分支。在 GitHub 中，分支在被合并到主（最后的分支）之前，可以在对仓库进行实验和编辑中发挥作用。
|
||||
|
||||
为了使项目适合每一个人，通常情况下，总是需要添加几个格外的分支来匹配不同的项目。在主分支上创建一个分支和复制主分支的当前状态是一样的。
|
||||
|
||||
[][4]
|
||||
|
||||
创建分支与在不同版本中保存单个文件是类似的。它通过在特定仓库上执行的任务重命名来实现。
|
||||
|
||||
分支在保持错误修复和功能添加工作中同样被证明是有效。在进行必要的修改后，这些分支会被合并到主分支中。
|
||||
|
||||
在创建仓库后创建一个分支：
|
||||
|
||||
* 在这个例子中，点击仓库名称 “Hello-World” 跳转到你的新仓库。
|
||||
|
||||
* 点击顶部的 “Branch-Master” 按钮，会看到一个下拉菜单，菜单里有填写分支名称的空白字段。
|
||||
|
||||
* 输入分支名称，在这个例子中我们输入 “readme-edits“。
|
||||
|
||||
* 按下回车键或者点击蓝色的 ”create-branch“ 框。
|
||||
|
||||
这样就成功创建了两个分支：master 和 readme-edits。
|
||||
|
||||
#### 3\. 修改项目文件并提交
|
||||
|
||||
此步骤提供了关于如何更改仓库并保持的指导。在 GitHub 上，提交（commits）被定义为保持修改的意思。每一次提交都与一个提交信息相关联，该提交信息包含了保存更改的历史记录，以及为何进行这些更改。这使得其他贡献者可以很轻松地知道你做出的更改以及更改的原因。
|
||||
|
||||
要对仓库进行更改和提交更改，请执行以下步骤：
|
||||
|
||||
* 点击仓库名称 ”Hello-World“。
|
||||
|
||||
* 点击右上角的铅笔图标查看和编辑文件。
|
||||
|
||||
[][5]
|
||||
|
||||
* 在编辑器中，写一些东西来确定你可以进行更改。
|
||||
|
||||
* 在提交消息字段中做简要的总结，以解释为什么以及如何进行更改。
|
||||
|
||||
* 点击提交更改按钮保存更改。
|
||||
|
||||
请注意，这些更改仅仅影响到 readme-edits 分支，而不影响主分支。
|
||||
|
||||
[][6]
|
||||
|
||||
#### 4\. 开启一个拉取请求
|
||||
|
||||
拉取请求（pull request）是一个允许贡献者提出并请求某人审查和合并某些更改到他们的分支的功能。拉取请求还显示了几个分支的差异（diffs）。更改、添加和删减通常以红色和绿色来表示。一旦提交就可以开启拉取请求，即使代码还未完成。
|
||||
|
||||
开启一个拉取请求：
|
||||
|
||||
* 点击拉取请求选项卡。
|
||||
|
||||
* 选择 readme-edits 分支与 master 分支进行比较。
|
||||
|
||||
* 确定请求，并确定这是您要提交的内容。
|
||||
|
||||
* 点击创建拉取请求绿色按钮并输入一个标题。
|
||||
|
||||
* 按下回车键。
|
||||
|
||||
[][7]
|
||||
|
||||
[][8]
|
||||
|
||||
[][9]
|
||||
|
||||
用户可以通过尝试创建并保存拉取请求来证实这些操作。
|
||||
|
||||
#### 5\. 合并拉取请求
|
||||
|
||||
最后一步是将 readme-edits 分支和 master 分支合并到一起。如果 readme-edits 分支和 master 分支不会产生冲突，则会显示合并拉取的按钮。
|
||||
|
||||
[][10]
|
||||
|
||||
当合并拉取时，有必要确保评论和其他字段被正确填写。合并拉取:
|
||||
|
||||
* 点击合并拉取请求的按钮。
|
||||
|
||||
* 确认合并。
|
||||
|
||||
* 按下紫色的删除分支按钮，删除 readme-edits 分支，因为它已经被包含在 master 分支中。
|
||||
|
||||
本文提供了 GitHub 平台从注册到使用的基本操作，接下来由大家尽情探索吧。
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: http://www.linuxandubuntu.com/home/getting-started-with-github
|
||||
|
||||
作者：[LinuxAndUbuntu][a]
|
||||
译者：[firmianay](https://github.com/firmianay)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]:http://www.linuxandubuntu.com
|
||||
[1]:http://www.linuxandubuntu.com/home/getting-started-with-github
|
||||
[2]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/github-homepage_orig.jpg
|
||||
[3]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/create-a-github-repository_orig.jpg
|
||||
[4]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/add-a-branch-to-github-repository_orig.jpg
|
||||
[5]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/commit-changes-to-github-repository_orig.jpg
|
||||
[6]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/commit-branch-to-master_orig.jpg
|
||||
[7]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/github-pull-request_orig.jpg
|
||||
[8]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/compare-commit-changes-github_orig.jpg
|
||||
[9]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/open-a-pull-request-in-github-repository_orig.jpg
|
||||
[10]:http://www.linuxandubuntu.com/uploads/2/1/1/5/21152474/merge-the-pull-request-github_orig.jpg
|
||||
[11]:http://www.linuxandubuntu.com/home/getting-started-with-github
|
||||
[12]:http://www.linuxandubuntu.com/home/getting-started-with-github#comments
|
||||
[13]:https://github.com/
|
||||
Loading…
Reference in New Issue
Block a user