Thanks to Liaoche, the great God shared git lessons
Master the following commands, basically daily enough local warehouse common operation to create a repository
Git init Add file to buffer
Git add file to warehouse
Git commit-m "Commint describtion" undo Modify or clear buffer
git reset/git reset HEAD file Discard or undo changes
Git checkout--file Delete
git rm fileEquivalent to git rm after git add undo Delete Operation
git resetgit checkout--file view specified file
Git cat file comparison w
As a qualified interaction designer, to facilitate product managers, designers, development and project-related personnel to see the intuitive effect of more effective communication; provide intuitive product vision, explain how users will interact with the product, in the interactive design process will produce a variety of outputs, such as flowcharts, thinking diagram ( Brain map), drafts on paper, and even high fidelity presentations.
Here simply
Article Description: Interactive Demo design, is the most basic skills of each interaction designer, which is a good way to comb the train of thought, but not the only situation, axure is not the only tool. It is worth trying as long as you can articulate the product ideas, interface UI, process logic, and interactive state of the tool.
For the convenience of product manager, designers, development and project-related personnel can see the intuitive effect of more effective communi
personally configure the version that I don't want to upload to the server.So the choice of stash is to temporarily save the current file.At this point, the Java file in eclipse will be restored, and one more stash record will be saved with the files previously restored.Because this time the file has been restored, as well as the previous version of the history of the same, so can pull. We do pull.After th
/dev merges branch Dev with the current branch
Disable Fast forward Merge: $git merge--no-ff-m "comment" Dev
Fetch: $git pull gets and merges the current branch
Stash : Staging: $git Stash "Store" the current work site (git stash push) to view the job site: $git stash List recovery does not delete: $git
Branch
Create branch: git branch name
Switch branch: git checkout name
Create + switch branch: git checkout-B Name
Merge a branch to the current branch: git merge name
Delete branch: git branch-D name
11. Merge conflicts
When git cannot automatically merge branches, the conflict must be resolved first. After resolving the conflict, submit it again and merge it.
Run the GIT log-graph command to view the branch merge graph.
-- No-FF parameter, disable "Fast Forward": git merge -- no-FF-M "merge
--no-ff parameter can be combined with the normal mode, the merged history has branches, can see that there has been a merger, and Fast forward merge will not be seen to have been merged. (8) Staging management: When fixing a bug , we fix it by creating a new bug Branch, then merging and finally deleting the branch. When the work is not finished, first put the work site git stash , and then go to fix the bug, repair, then git
File: New filegit stash -uShow All stashesgit stash listGo back to the state of a stashgit stash apply {n}>Go back to the last stash state and remove this stashgit stash popDelete all the stashgit stash clearTo take out a file mo
repeat.Reference Address: http://www.takobear.tw/12/post/2014/02/bear-git-flow-sourcetreegit-flow.htmlSecond, create branch branch with command-lineCond......----------------------------------------------------------------------Split Line-------------------------------the following tips----------- ------------------------------------1, Git stash commandSpeaking of branches, using git to develop more complex projects I think there will be a number of
paper, and marker pens to create low-fidelity paper prototypes. As the team increases their confidence in the product concept, the designer will create a higher-fidelity digital model accordingly. This process is applicable in many cases, but the development of a global product may be somewhat different.
Consider the following carefully before building and testing a prototype:Location
Where can I test the
requirements is completely different from the first ads. 1.3.4 Drawing SketchAds is a textual display.To turn it into a more intuitive and understandable form, it is more appropriate to sketch the picture, as shown in 1-23.Fig 1-23Sketching does not require a complex, simple is good.It is important to show the results of the thinking. Tools with a bit of skill, anyone can easily get started.1.3.5 Low fidelity Prototype and high
Forward模式,导致合并后删除原来的分支后,看不出主分支曾经合并过存档list恢复存档git stash apply 存档id删除存档git stash drop 存档id上面的恢复和删除可以用下面的命令合并操作git stash pop 存档id
When working in the current branch for a period of time temporarily need to switch to another branch, but the contents of the current branch cannot be submitted, this time can be used to use the command to log
, so with the-m parameter, write the commit description in:$ git merge--no-ff-m "merge with No-ff The Dev"Store" The current Job site:$ git stashview a list of stored work sites:$ git stash listRestore the "storage" work site and also delete the stash content:$ git stash popRestore the "storage" work site without deleting sta
. If you do, do not panic, because as long as git generally does not actively delete the contents of the local repository, depending on the situation you lost, can be retrieved, such as after the loss can use git reset--hard orig_head immediate recovery, or use Reflog command to view a reference to a previous branch.3.4 StashSometimes, we do some work on one branch and modify a lot of code, and then we need to switch to another branch to do something else. But do not want to do only half of the
, it's usually checkout to make sure there's no conflict.-M"Merge" //Tips for Merging*********************************************************************************************see the following situation to pay attention to conflict. Don't forget to resolve the conflict.*********************************************************************************************master should be published directly. So there should be no conflict when merging to master, so it is not recommended that multi
...//create and switch branches equivalent to git branch b_name git checkout b_nameGIT branch b_name//Create branch PS: Create branch clone from current branchgit checkout b_name//Toggle BranchGit branch//view Current Branch branch operation use this command plus option (-D Delete-D to delete an unincorporated branch) checkout just toggle (-B does not exist will be created)git merge b_name//merge current branch with specified branch--no-ff-m "commit_msg" commit record for this mergegit--graph--
, which is the default origin18, Git branch: View branch.Add:Git branch--set-upstream branch-name origin/branch-name: Create a link relationship between the native branch and the remote branch.Git branch--set-upstream-to=o/server_side_branch_name your_branch_name19, Git branch 20, Git checkout Add:git checkout git checkout "@{10 minutes Age}": Switch to version 10 minutes ago (Commit-id)Git checkout "@{5}": Switch to the 5th to the bottom of the Commit-id.21, Git checkout-b Add:Equivalent to the
In ~ /Directory
Create or modify a file gedit. gitconfig
Copy the following to the default configuration.
[Color]
Ui = auto
[User]
Name = w22ee
Email = w22ee@126.com
[Alias]
St = Status
Ci = commit
BR = Branch
CO = checkout
CVSup =! Sh-C \ "Git stash git cvsimport-v-K-I git rebase origin git stash pop \"
Svnup =! Sh-C \ "Git stash git SVN rebase git
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.