I have two branch and they are called as NewFeature1 and subFun100. subFun100 is a branch created from previous commit in NewFeature1. Now, I have fixed code in subFun100 and I want to merge back into NewFeature1 branch. But, I have conflict like this. I just want to take both codes and how shall I do? Merge button is hidden and I can't click. Is there any step I am missing?
Merging Two Branches from developer apple.
3 . Resolve differences by using the left and right buttons to specify which file’s contents to use.
4 . After resolving all differences and conflicts, click Merge.
Use these 4 buttons. (red circle)
How To Use Git Source Control with Xcode in iOS 7
You need to resolve each conflict, choosing either left, right or both.
Only then you can complete the merge.
Locked. This question and its answers are locked because the question is off-topic but has historical significance. It is not currently accepting new answers or interactions.
Now that Xcode 4 is officially released it's time for a follow up to my previous question: Hidden Features of Xcode
So what are they? What are those hidden little Xcode 4 hints & tips that you can't live without?
Please limit your tips to those that are new and specific to Xcode 4!
If you like your code to look as good as it runs, you've undoubtedly used #pragma mark - and #pragma mark <name> to provide a nice visual grouping in the Xcode class dropdown list. Xcode 4 now combines these into a single #pragma mark - <name>.
More on pragma mark.
shift-cmd-opt click on a symbol lets you tell Xcode exactly where in the UI you want the navigated-to file to open.
cmd-ret makes the version editor / assistant (the right hand pane) go away
shift-cmd-Y to hide the debugger
cmd-0 to hide the navigator (left pane)
cmd-[1..n] switch between navigators on left
cmd-opt-[1..n] switch between utilities (thing generally on right)
ctrl-[1..n] switch between various related files in the editor
Overall, Xcode 4 tries to keep things consistent w/the hot keys. Cmd is for mainline commands. Adding modifiers is for analogous commands focused on one particular sub-feature.
(These are just the four that come to mind as the my most pounded upon shortcuts that I'm using constantly! I'm sure it'll change over time as my workflow is refactored into the new hotness.)
Xcode 4 adds a new "Code Snippets" feature, accessible via View > Utilities > Code Snippet Library. To add a new code snippet, select some text in the editor view and drag it into the snippet library. You can either drag a snippet out and drop it in your code to use it, or, much more conveniently, assign a completion shortcut to it.
When you type in that series of letters, it will automatically show up in the code completion pop-up menu as you type your code. For example, among many others, I have a snippet set up so that typing "svk" will expand to setValue:<#value#> forKey:<#key#>. This can save a lot of typing and/or fishing around in the autocompletion menu for the methods and other code expressions you use the most. Xcode ships with a bunch of built-in snippets that come in very handy as well.
New shortcut I use most often: triple-finger swipe (up or down) to swap counterparts (between the interface and implementation files). No more hand acrobatics!
Thanks to https://twitter.com/xctotd/status/48148271759241216
shift-option-click on a file in the Groups and Files list Project Navigator, or hold shift-option while choosing a file from the Jump Bar.
You'll get a pop-over from which to pick where to open the file. New or existing tab, new or existing split (Assistant) editor, new window—every possible option is there.
Tabs in Xcode 4 are awesome. Each one maintains its own separate layout, so you can have multiple tabs with different things in them and have each one lain out appropriately.
I've been setting up my projects with three layouts—one for the project object, one for each nib (showing the owner's class's sources), and one for each class.
There is one bug here: As of 4.0, Xcode will reset the state (turning off any Assistants) of the active tab when you reopen the project. The workaround is to switch to a tab with no Assistants for Xcode to close before you close the project. I have filed this as Radar number 9178441.
ctrl-6 pops down within-file segment of jump bar (enables keyboard-controlled jump to methods)
cmd-{/} select previous / next tab
cmd-J navigate to any editor (but why oh why doesn't TAB then cycle between them?)
Editor ShortCuts
Cmd + Ctrl + up/down Jump between
.h & .m Files.
Cmd + Ctrl + Left/Right Jump between Previous
Edited Files/Next Edited files.
Layout Shortcuts
Cmd + 0 hide or show navigators
Cmd + opt + 0 hide or show inspectors
Cmd + Shift + Y hide or show debugger console.
Navigators Shortcuts
Cmd + 1 Project
Cmd + 2 Symbol
Cmd + 3 Search
Cmd + 4 Issue
Cmd + 5 Debug
Cmd + 6 BreakPoint
Cmd + 7 Log
Tab Switching & Jumping
Cmd + { Previous Tab
Cmd + } Next Tab
Cmd + j Select location to jump
Shift + Option + ClickFile Select location to open file
Cmd + Alt + Option + Click Select location to open Method
Inspectors
Cmd + Opt + 1 File Inspector
Cmd + Opt + 2 Quick Help
Cmd + Opt + 3 Identity Inspector
Cmd + Opt + 4 Attribute Inspector
Cmd + Opt + 5 Size inspector
Cmd + Opt + 6 Connection Inspector
Build Related
Cmd + B Build
Cmd + Shift + K Clean
Cmd + . top
Code Folding
Cmd + Alt + Left Minimize Current Method/Class/Interface
Cmd + Alt + Right Expand Current Method/Class/Interface
Cmd + Alt + Shift + Left Minimize All Method/Class/Interface
Cmd + Alt + Shift + Right Expand All Method/Class/Interface
Here's the first. Tabs! Xcode 4 has replaced Xcode 3's useful but rarely used "favorites bar" with persistent tabs. This means you can keep a working set of commonly used documents in your tab bar.
Not exactly a hidden feature as such - but the fact that the tabs are persistent is perhaps easily missed.
If you're having any sort of trouble with the indexing of your project (e.g. symbols not showing up in autocompletion), open the Organizer window, click the Projects tab, and use the "Delete" button to delete the derived data for your project. This will force a rebuild of the project's index, as well as tossing out any built products.
Some useful hotkeys for working on smaller screens are:
cmd-shift-y - Hide and show the console/debug area
cmd-0 - Hide and show the file navigation
You can now associate groups in the Project Navigator with folders on disk. It always bugged me before that the Xcode 3 file view may not represent the actual structure of the project on disk.
Create a new group, then with the new group highlighted, open the File Inspector. In the identity section on the right just below the 'Path' is a small icon, click this to open the file browser dialog allowing you to select the directory for this group.
If you hold the FN key then you can scan through your document with the cursorkeys, without moving the cursor
Jump bar:
if your write outside function:
// FIXME: A Bug
// TODO: Later
// ???: ???
// !!!: !!!
// MARK: This a mark
Will like:
Also you can search:
Click with Option(With Shift at the same time, you can choice another window), you can see a dialog letting you specify where the file should open:
Source control:
If you use svn or git, discard change is easy:
Interface buidler
In xcode 4.2, you can jump to interface builder here:
Click a ui object with Shift, it will show a list of all objects under the point.
Try this:
Select a ui object, hold Option, then move mouse over other objects. It will like:
Other
Hotkey: Shift+Command+O Open Quickly
Try:
#error message
#warning message
And read:
Writing and Editing Source Code
Text Editor:
Cmd-clicking on a class name will take you to the implementation (or header) file of that class, cmd-clicking on an object will take you to where the object is declared.
Alt-clicking will open a documenation popup for the object you clicked on.
Adding frameworks: You cannot simply do this by right-clicking on the project or a group (like in Xcode 3). You need to go to the project view, select your target and go to "Build Phases" tab. Frameworks can be managed under the "Link Binary with Libraries" section.
Setting target dependencies: Similar to the above, in the "Target Dependencies" section of the "Build Phases" tab.
Keep your archives safe -prior to installing Xcode 4 (from 3). You will lose them (most likely) and with them lose your ability to symbolicate your crash logs.
Delete action-BEWARE: "Delete" (instead of "Remove Reference Only") directly erases the file from your drive. It doesn't go into the Trash, so you cannot recover it.
cmd-J jumps to the editor, but if you have more than one editor open you get an overlay that has all of the open editors. you can use cmd-→ and cmd-← to switch between the open editors.
Also, if you are having a hard time finding an option or property for anything the utilites window is probably your best bet:
hide and show utilities: cmd-opt-0
Things that are commonly hidden here that aren't intuitive:
data model entity properties.data model propertiesxib properties
You don't need to declare IBAction - methods in .h File. & You can directly connect it in Interface Builder.
Example:
-(IBAction)btnLogInTapped:(id)sender {
// place following method in .m file of your code. save file. Open the
// .xib file of viewController
// click on files owner
// click on connection-inspector.
// you can view your methods under "received actions"
}
You don't need to declare variables, if you are creating property for it.
Example:
// a property declared in .h File of your view controller.
#property (nonatomic, retain) LogInVCtr *nxtLogInVCtr;
// synthesize above property in .m File
#synthesize nxtLogInVCtr;
// or
#synthesize nxtLogInVCtr = _nxtLogInVCtr;
// and you are done, you don't need to declare variable for it.
One of my favorites is the "Open Tab" behavior preference. If you go to "Behaviors" in Preferences, you can set it to go to a specific tab whenever a run starts. You can name the tab, something like "Debug" and Xcode4 will create it for you if it doesn't exist, and take you there when you start debugging. You can configure this tab just how you like it for debugging sessions, and it will stick that way after you close it, so whenever you do a run Xcode4 will be set up just how you want it, in a separate tab. You can even tear this tab off to a separate window, in which case Xcode4 will open a new specially configured "Debug" window each time you start a run! This feature is great because it keeps your regular code editing tab or window uncluttered with the log and debugger panes. Simply close the "Debug" window when you're done running and you can be back to your clean screen of code.
In XCode3, There was an option for "Rename the Project". Now, you just need to click twice ( second click slowly ) to rename the project & Its done.
To Limit the Number of Concurrent Build Operations
This is a (somewhat) hidden preference which allows you to define the number of concurrent compile tasks:
defaults write com.apple.dt.Xcode IDEBuildOperationMaxNumberOfConcurrentCompileTasks 4
To Disable Indexing in the IDE
This one disables code sense indexing, which can save a lot of resources in large projects:
defaults write com.apple.dt.XCode IDEIndexDisable 1
to reenable:
defaults delete com.apple.dt.XCode IDEIndexDisable
Note that you should quit Xcode, set the preference values as desired, changes take effect when you restart Xcode.
If you prefer using vim/emacs running on, say, Terminal, or any other external editor, you can just create your xcode project, add files and whatnot and then switch to editing said files using whichever edit suits you best; whenever you switch focus to an xcode4 window, the modified files will be reloaded( was also the case with Xcode3 ) and you can build / run your application.
Two kinds of Build location specification using XCode4 Preferences.
Location Specified By Targets - 'Build' Directory is located within your project directory.
Location in Derived Data ( Recommended by XCode, as you can see in screen shot ) - 'Build' Directory is located under DerivedData location specified ( e.g. here in my case, /Users/digicorp/Library/Developer/XCode/DerivedData )
Please look at following screen shots.
QUICK HELP
Ctrl + Option / Alt + f
Find the Quick help. For example,
#property (nonatomic, retain) NSString *strQuery;
My Text cursor is at NSString & if I press Ctrl + Option + f then It will show a quick documentation in the inspector/utilities.
How do I switch between the header and implementation file in Xcode 4?
In XCode 3 it was cmd and right or left (I think)
Ctrl+Cmd+Up or Down, but the shortcut seems a bit finicky and sometimes stops working, not yet sure when and why.
Be sure to FIRST click ON the actual code window...
that's the critical tip to ensure it works. Click anywhere at all on the actual code. (If you're active in one of the other many panes of Xcode, the keystroke combo has no, or different, meaning(s).)
Also, you can 3 finger swipe up and down on the touchpad if you have one.
Ctrl+Cmd+Up or Down
The shortcut sometimes stops working!!
The menu option has moved to "Navigate->Jump to Next Counterpart" and "Navigate->Jump to Previous Counterpart".
In preferences the key binding is now under "Jump to Next Counterpart" and "Jump to Previous Counterpart".
Why Apple insist on changing the menu positions AND names of these things is beyond me! I mean "Counterpart"!?
Worth nothing that Ctrl+Cmd+Left or Right move between previous and next files that were viewed (I mean "counterparts") too. These are also under the key bindings "Jump to Next Counterpart" & "Jump to Previous Counterpart").
The reason the menu option has been split between:
"Navigate->Jump to Next Counterpart" and "Navigate->Jump to Previous Counterpart"
is because you can have more than just one header file and one source file with the same file name. Besides having matching .xib files for view controllers, I have separate .vsh and .fsh files for vertex and fragment shaders in my OpenGL program. Along with my .h and .cpp files that's a list of 4 files that I can navigate up or down through with one key binding, instead of hitting the same key binding 3 times in a row to cycle back from file 2 to file 1.
Also in Xcode 6.1/7.1 shortucts are the same:
Jump to next counterpart:
Ctrl+Cmd+Up
Jum to previous counterpart:
Ctrl+Cmd+Down
Personally, coming from eclipse, I change this shortcut with:
Ctrl+Tab
this combination insn't already binded to anything else.
Xcode -> Preferences -> Key Bindings
search for "Jump to next counterpart" and put the new keys combination.
PRO
This is more efficient than default bindings see that you can use one hand instead of two!
"but the shortcut seems a bit finicky and sometimes stops working, not yet sure when and why."
Sometimes Xcode loses track of which .m and .h belong together. This is e.g. the case
when you open one of the files directly from the Finder. When you open the file from
the file list in Xcode, it normally works okay. Although when you have moved files between
folders & groups in the file list of Xcode, it will also list the relation between the files.
The command to swap between m and h files is CTL-CMD-up/down. It sometimes get stuck. To unstick it simply save the file, i.e. CMD-S, and the hotkey should work again.
Back Arrow Broken In Xcode?
Is there keyboard command to go back/forward one file at a time.
Xcode 3.2 changed the behavior of Cmd-Opt <-- and -->. As noted in another question, they do not operate on a file level like in previous versions of Xcode, but on an "edit point", making it cumbersome to flip through a list of files (the quick way to do it, since Xcode does not support Tabs, as in Eclipse).
Rob Keniger found a partial solution that he noted in another post:
"Hold down the option key while you click the forward/backward arrows ..."
But this requires fiddling with the mouse. Is there any way to do it with the keyboard only?
EDIT:
Later versions of Xcode (v7.2+) now have a Navigate menu (and it changes the keyboard shortcuts yet again):
In XCode 4.4 the following sequence works:
Cmd + Ctrl + ←
and it operates on a file level.
On Xcode 8 I use 2 fingers left / right
Beginning in XCode 3.2.3, the following key sequence works:
Cmd + Option + Shift + ←
Without the Shift key, it just goes back to the previous cursor position. Adding Shift jumps to the previous file (next file, in combination with →).
Navigation shortcuts for Xcode