is invisible to others:Git push originUpdate and mergeTo update your local repository to the latest changes, execute:Git pullTo get (fetch) in your working directory and merge (merge) remote changes.To merge other branches to your current branch (for example, master), execute:Git mergeIn both cases, git tries to automatically merge the changes. Unfortunately, this may not succeed every time and may result in conflicts ). At this time, you need to modify these files to manually merge these confl
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
play at all), many developers are still in use.2.idfv+key ChainSince IDFV removed the app and then reinstalled, the identifier changed, to solve this problem, you can save the first generation of the ID to the key chain, delete the app after the key chain in the data is OK.#define KEY_UDID @ "Key_udid"#define Key_in_keychain @ "Key_in_keychain"#import #import "APPIdentificationManage.h"@implementation AppidentificationmanageSingleton_implementation (Appidentificationmanage)#pragma mark gets the
the Mac os X I use every day as an example. The MAC system has a built-in Keychain service and its management program that can help you manage various keys, including SSH keys, conveniently. Ssh-add By default adds the secret key to the currently running ssh-agent service, but you can change the default behavior to add it to the Keychain service and let the MAC help you remember, Manage and guarantee the s
by default since it would be exp Loitable by malware. (The kernel won ' t refuse if you is root, but the course you don ' t want to is root to debug.)
The most-up to date method-to-allow GDB-control another process is-to-sign it with any system-trusted code signing auth Ority. This was an easy process once you had a certificate (see the section below). If The certificate is known as Gdb-cert, just use:
$ codesign-s Gdb-cert gdb
Old Notes:in Tiger, the kernel would accept processes whose primar
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
to create a new app ID:Open the Register iOS App ID page and enter a name (such as "Hbuilderapp") in the "name" entry under the "APP ID Description" field:Enter the app ID in the Bundle ID entry under the Explicit App ID column (using the reverse Domain name format string, such as "io.dcloud.HBuilderApp"):Note: You need to enter this value in the AppID bar of the app Cloud packaging interface in HbuilderUnder the App Services bar, select the service you want to use for your app (if you need to
in both your System and Login keychains. To resolve the issue, your should first download and install the NEWWWDR Intermediate certificate (by double-clicking on th e file). Next, in the Keychain Access application, select the System Keychain. Make sure to select "Show Expired certificates" in the View menu and then delete the Expired version of the Apple Worldwid E Developer Relations Certificate Authorit
(development) certificate or a publish (distribution) certificate, you need to use a certificate request (. certsigningrequest) file, and the certificate request file needs to use "Keychain Access" on Mac OS Tool generation.Search for "Keychain" in "Spltlight search" and open the "Keychain Access" tool:Open the menu "Keychai
ObjectiveThere are a lot of related blogs about Jenkins online, which is not repeated here. The new company to build the environment, I also refer to the following blog:http://www.jianshu.com/p/41ecb06ae95f said in detail and no longer elaborate. Of course in the actual construction also met a lot of pits, so close up this blog to supplement.1. Initial Password AcquisitionCommand line: cd/users/shared/jenkins/home/to the current directory, modify the/secrets/directory permissions after using the
How to view the Mac saved Web site software password
Workaround:
1. Turn on the Finder application utility keychain Access.
2. Click on the upper left corner of the "Landing", the right side can see the previous Mac remember the password of the website/software and other Items list.
3. Double-click the item you want to view, and the details shown in the following image will be popped up. But you will find that the password part is not displ
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
Tags: keychain requires PPPoE technology HTTP app fixed ENC deny1. networking RequirementsThe MSR V5 Router uses PPPoE dialing method to surf the Internet, IP address is not fixed, the MSR V7 router uses fixed IP address to surf the internet, and two devices use Savage mode to establish IPSec VPN to protect the traffic of intranet exchange.2. Configuration Steps1) MSR V5 router# Configure an Access control list that defines the traffic that subnets 1
root, but the course you don ' t want to is root to debug.)The most-up to date method-to-allow GDB-control another process is-to-sign it with any system-trusted code signing auth Ority. This was an easy process once you had a certificate (see the section below). If The certificate is known as Gdb-cert, just use:$ codesign-s Gdb-cert gdbOld Notes:in Tiger, the kernel would accept processes whose primary effective group is PROCMOD or Procview. That means this making gdb setgid procmod should work
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.