(6) the Git and making: (2) submit code + team | Web front knowledge

Original: itsOli @ front-end 10,000 hours this article was first published in the public number "front-end 10,000 hours" this article belongs to the author, without authorization, please do not reprint! This article is adapted from "sparrow" private pay column "front end | ten thousand hours from zero basis to easily obtain employment"Copy the code

❗ ️ ❗ ️ ❗ ️

The following link is the latest erratum to this articleGit and GitHub: Commit code + Team work

Use Git proficiently.Copy the code

Preface: in the previous “from zero basis to ease employment | Git and making: (1) the Git, making initial understanding, we understand the importance of version control, and the preliminary cognition to Git, making us the front end of the study and work will always be accompanied by a path.

Last time we learned how to clone an existing project from GitHub into a local repository. On the other hand, if we create a local repository first and the project is in progress, is it possible to push the repository to GitHub remotely?

There is also a question, since Git is the new age of distributed version control system, and GitHub is a software source hosting service platform for version control through Git. What about when we’re a team working on a multi-person development project?

Now, let’s get started and solve each one in the form of two tasks.

1 Create a local repository and push it to a remote repository

• ✅ task: create a local file on our computer to save the upcoming project test2, and then find a way to push the changes related to this local file to GitHub remote repository.

1.2 The second step is analysis

After clicking Create Repository, you will see some new prompts:

• Note 1: Don’t be afraid of this interface, it doesn’t give us an error, it gives us some guidance on how to do it step by step. Note 1 here lets us create a local repository using the command line shown below, and then associate the remote repository step by step.

• Note 2: This is to let us directly use the command line to push a local repository of our computer.

mkdir test2
cd test2
Copy the code

1.4 Step 4: Initialization

Initialize this local test2 folder as a local repository:

git init
Copy the code

• Note 1: After the test folder is created locally, be sure to locate the path to this folder.

• Note 2: we can only initialize this folder after locating it, otherwise you will initialize the entire home directory as your local repository! Init is short for “initinal”. This command is used to initialize a local folder into a local repository.

• Note 3: here.git is the best standard for checking local folders and local repositories.

Git readme.md echo "git readme.md" > < span style = "box-sizing: border-boxCopy the code

1.6 Step 6: Commit locally

git add .
git commit -am "init"
Copy the code

git remote add original [email protected]:oli-zhao/test2.git
Copy the code

• Note 1: In this command, remote means remote; A. add B. add C. add D. add Original is the name we gave to the test2 remote repository (you can choose whatever you want); The following [email protected]:oli-zhao/test2.git is the URL given in the upper right corner of the GitHub interface in step 2. I named the remote repository “original” and the URL of the remote repository is [email protected]:oli-zhao/test2.git.

• Note 2: This command pushes the changes submitted to the local repository in step 6 to our remote repository named Original. — What’s the original here? It is [email protected]:oli-zhao/test2.git. You can put this address directly on it, but because it is long and hard to remember, we give it a label called original.

1.8 Step 8, complete the test

Then refresh your GitHub screen and the screen in step 2 will now look like the following, which means we’re done:

Git remote remove git remote remove git remote remove Git remote set- URL Specifies the tag of the URL to be modified. New URL 3. Git remote rename specifies the name of the current tagCopy the code

2 Teamwork tool: Branch

• ✅ task: have a preliminary understanding of what branches are, what functions they have, and roughly know how to use them.

2.2 How to use branches?

In a real world work scenario, teamwork relies more on branching than anything else. One of the most powerful aspects of Git compared to SVN is its powerful “branch”.

git branch develop
Copy the code

※ Push the “Develop branch” of the local repository to the “Develop branch” of the remote repository

Git push original develop:develop ❗️Copy the code

git checkout develop
Copy the code

2.2.4 Develop the project in this branch and submit it to the local warehouse branch

touch a.md
git add .
git commit -am "a.md"
Copy the code

git push original develop
Copy the code

2.2.6 Merge the Develop branch with the master branch

• Switch to the master trunk branch:

git checkout master
Copy the code

• Merge all add, delete, change and check items from the Develop branch into the master:

git merge develop
Copy the code

Right now my code on the GitHub remote repository is still my code on the Master branch, only one copy.Copy the code

2.2.8 Pushing to the Remote Warehouse

git push original master
Copy the code

• Note 1: At this point, open GitHub to see if test2 has added a branch with an a.d file.

• Note 2: After this step is complete, refresh GitHub to see if test2’s master branch also has an a.d file and if the develop branch contains the same files as the master branch.

git pull
Copy the code