Restore"Git checkout--Create SSH Key$ ssh-keygen-t rsa-c "[Email protected]"Associate a remote warehouse Xx.git remote Warehouse AddressGit remote add Origin xx.gitThe first time you push all the contents of the master branchGit push-u Origin MasterTo clone a warehouse, you must first know the address of the warehouse and then clone it using the git clone command. GIT supports multiple protocols, including HTTPS, but the native GIT protocol supported by SSH is the fastest.git clone xx.gitView B
file to the previous version: git reset -- hard HEAD ^
View Command records: git reflog
Branch Operations
Create branch: git branch dev
Create and switch to the branch: git checkout-B dev
Switch branch: git checkout master
Delete branch: git branch-d dev
Merge with current branch: git merge dev
View branch: git branch
Remote warehouse operations
Create an SSH Key: ssh-keygen-t rsa-C "youremail@example.com"
Cl
When working with Git pull code, colleagues often encounter conflicting situations, prompting the following information:
Error:your local changes to ' C/ENVIRON.C ' would is overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
This means that there is a conflict between the updated content and the locally modified content, either by committing your changes or by temporarily storing the local changes first.
publish, or after the dev branch code is stable, it can be merged to the master branch.
7. Bug Branch:
During development, bugs are often encountered, so Bugs need to be fixed. In git, the branches are very powerful, and each bug can be fixed through a temporary branch, after the repair is completed, merge the branches and delete the temporary branches.
For example, when I receive a 404 bug during development, we can create a 404 branch to fix it. However, the work on the current Dev branch has
to fix, in Git, the branch is very powerful, each bug can be repaired by a temporary branch, after the completion of the repair, merge branches, and then delete the temporary branch.For example, when I get a 404 bug in development, we can create a 404 branch to fix it, but the work on the current dev branch is not yet committed. such as the following:It's not that I don't want to commit, but the work is done halfway through, and we're not able to commit it, such as my branch Bug, which takes 2
or undo Modify command:#在Git中, head represents the current version, the previous version is head^, the last version is head^^, the last 100 versions arehead~ID> -- Hard head^ file name> --file name> #撤销工作区的修改 Branch operations related commands (master Main branch, head pointing to current branch):Git branch #查看分支 with * -B #创建并切换到指定分支git checkout-b -D name>-D forward mode) #当Git无法自动合并分支时, must resolve the conflict first, then submit, Merge Complete(Bran
simplified output)15, non-rapid merger (teamwork): If you use quick Merge, merging and deleting branches will not be able to see that there have been branches, so you can use a non-quick merge.Enter git merge--no-ff-m "..." directive, parameter--NO-FF indicates a non-fast merge, because this merge is to create a new commit, so add-m parameter and fill in the description.In team development, the master branch is used only to publish new versions, usually working on the dev branch. Everyone has a
the SSH service did not start (akzent)) the-u parameter associates the local and remote master to clone from the remote library: Git clone[email protected]: themoonstone/ubuntu_git.git Create and switch new branch: git checkout-b newbranch parameter-B to create and switch branch merge: git merge newbranch git Merge: Merge specified branch to current branch Delete branch: git branch-d oldbranch Force Delete branch: git branch-d oldbranch View branch merge graph: git log--graph when merging bra
clone a remote Git project locally as well:+ open git bash,mkdir xxx cd xxx
git init
git config--global user.name ' andyliwr '
git config--gloabl user.email ' 121960425@qq.com '
git Remote add-f-T Master-m Master Origin https://github.com/Andyliwr/blog.git
Git merge origin
7. If a permission error occurs when cloning a remote project.
Solution :+ First Look at the local there is no SSH key (generally in/c/users/andyliwr/.ssh/id_rsa.pub)+ If not, use ssh-keygen-t rsa-c "lidikang@idwzx.com" to
Merging branches, plus the--NO-FF parameter can be combined with normal mode, the merged history has branches, can be seen
There have been mergers, and fast forward merge doesn't look like a merger.
Git also provides a stash feature that allows you to "store" your current work site and continue working after you resume the site:
Git stash the job site and now sees the contents of the current branch
with normal mode, the merged history has branches, and can be seen to have been merged;- M parameter, write the commit description in)Git stash ("store" the current job site, and then continue working after resuming the site)Stash git list (view work site)/git stash apply [email protected]{0} ()Git stash POPs (restore
switch to another branch without commit modification. So we need to use the stash.git stash backup git stash pop read and resume (pop command no longer has, after apply) git stash list git stash clear empty git stash apply [stash
pre-prepared 1 : JDK Download and install: jdk-6u45-windows-i586.exe 2 : MySQL JDBC Connection driver: Mysql-connector-java-5.1.25.zip 3 : MySQL database download and install: This xampp-win32-1.8.2-0-vc9.zip is recommended here, without the hassle of installing MySQL and configuration. NBSP 4 : Create Jira user in MySQL, jira database, set user rights (also can be created and set through the page). INSERT into Mysql.user (HOST, User, PASSWORD) VALUES ("localhost", "Jirauser", PAS
This article is from: http://toyota2006.javaeye.com/blog/265061jirais a software for Bug Tracking, problem tracking, and project management.
The following describes how to crack and install the latest version of Jira.
(Note: any version of Jira can be cracked using this method)
1. First download Jira
2. Create data
3. Set environment variables and modify the configuration file
4. Update Tomcat Libraries
5. Crack Jira
6. Start tomcat to install Jira
1. Download Jira
: Http://www.atlassian.com/sof
1 , install the Java environment[Java Environment installation Check out the Java environment installation]2 , install the database and add the Jira database and user authorization[See MySQL installation for MySQL environment installation]Mysql> CREATE DATABASE Jira charactor set ' UTF8 ';mysql> grant all on jiradb.* to ' jira ' @ '% ' identified by ' jira123 '; mysql> flush Privileges;3 , related packages and instructionsAtlassian-jira-6.3.6.tar.gz Jira installs the package, the decompression a
JIRA installation and deployment in CentOS 6.5
JIRA introduction:
JIRA: Professional defect tracking and project management software
JIRA is a project tracking management tool that helps teams create scheduled tasks, build and release excellent products. Thousands of teams around the world use JIRA to capture, manage defects, assign tasks, and track team activities. JIRA works perfectly on both desktop PCs and mobile devices to help the team complete their work.
For more information, see http://
The Atlassian application allows the user to use a reverse proxy, but Atlassian does not support the configuration of this feature. Therefore, there is no guarantee that Atlassian can provide any support for these configurations .If you have any requirements on the configuration, please refer to the content in Atlassian
). This option allows you to reverse the already submitted thing to a state that has been updated but not committed (Updated butnot Check in). It is as if the Git-update-index command has been executed, but there is no git-commit command to perform.--hardThe contents and the index in the working tree are switched to the specified version location, which means that all the following contents and the contents of the work tree are lost. Therefore, this option should be used with caution, unless you
the mode to be disabled, Fast forward git will generate a new commit at merge, so you can see the branching information from the branch history.
To prepare the merge dev branch, note --no-ff The parameter, which indicates disabled Fast forwar :
$ git merge--no-ff-m "merge with No-ff" Dev
You need to add-m to it because a new branch is created and you need to add a description
13.bug Branch: official website from Liaoche
Each bug should be handled using a single branch:
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.