Here&#39;s the only tool I&#39;ve ever come across which lets you merge storyboards:

https://github.com/marcinolawski/StoryboardMerge

I need to recursively list all directories and files in C programming. I have looked into FTW but that is not included with the 2 operating systems that I am using (Fedora and Minix). I am starting to get a big headache from all the different things that I have read over the past few hours. 

If somebody knows of a code snippet I could look at that would be amazing, or if anyone can give me good direction on this I would be very grateful. 

How to recursively list directories in C on Linux?

I have some code that is acting up and I suspect it&#39;s because I&#39;m operating on the wrong types of data or converting between them poorly.  

It is mixing `cv::Mat` objects of types `CV_8U` (which is what is created when reading a jpg as grayscale with `cv::imread`), `CV_32F`, and `CV_32S`.

What are the differences between these data types, and what do I need to be sure of when converting between them?

What are the differences between CV_8U and CV_32F and what should I worry about when converting between them?

Is there a way to merge XCode 4.2 Storyboard files? 

I&#39;m working with another developer on an iPhone project and all my attempts at merging changes into a storyboard file have met with failure and after which Xcode is no longer able to load the storyboard. Consequently I have to do an svn revert and then redo my modifications.

XCode Storyboard merging

<p>Is there a way to merge XCode 4.2 Storyboard files?</p>
<p>I'm working with another developer on an iPhone project and all my attempts at merging changes into a storyboard file have met with failure and after which Xcode is no longer able to load the storyboard. Consequently I have to do an svn revert and then redo my modifications.</p>


So far, my preference has been to always use EntityManager&#39;s `merge()` take care of both insert and update. But I have also noticed that merge performs an additional select queries before update/insert to ensure record does not already exists in the database.

Now that I am working on a project requiring extensive (bulk) inserts to the database. From a performance point of view does it make sense to use persist instead of merge in a scenario where I absolutely know that I am always creating a new instance of objects to be persisted?

JPA merge vs. persist

When using git, is there a way to show commits made to a branch, while ignoring all commits that were brought in by merging?  

I&#39;m trying to review the code changes made on a branch while ignoring the ones we made on other branches that were merged in.  I know it&#39;s damn near impossible to show a diff in that fashion, but I&#39;d like to be able to find out which commits I need to review.

Showing commits made directly to a branch, ignoring merges in Git

I am trying to replicate the functionality of the `cat` command in Unix.

I would like to avoid solutions where I explicitly read both files into variables, concatenate the variables together, and then write out the concatenated variable.

How do I concatenate two text files in PowerShell?

I set up a branch in the remote repository and made some commits on that branch.
Now I want to merge the remote branch to the remote master.

Basically follows are my operations:

1. checkout branch
2. checkout master
3. merge branch and fix merging errors
4. commit
5. push origin HEAD:refs/for/master

But get error messages on the 5th step:

    remote: Resolving deltas:   0% (0/12)
    
    remote: ERROR: missing Change-Id in commit message
    ...
    
    remote: Change-Id: I55862204ef71f69bc88c79fe2259f7cb8365699a
    
    To ssh://prc@test.gerrit.xxx.com:29418/hello_git
     ! [remote rejected] HEAD -&gt; refs/for/master (missing Change-Id in commit message)


Gerrit error when Change-Id in commit messages are missing

Some Git commands take the parent as a revision; others (such as `git revert`), as a parent number. How can I get the parents for both cases?

I don’t want to use the graphical log command as that often requires scrolling down a long tree to find the second parent.


How can I get the parents of a merge commit in Git?

I am trying to adjust the cell height for one of the cells on my table view. I am adjusting the size from the &quot;row height&quot; setting inside the &quot;size inspector&quot; of the cell in question. When I run the app on my iPhone the cell has the default size set from the &quot;row size&quot; in the table view.

If I change the &quot;row size&quot; of the table view then the size of all cells changes. I do not want to do that as I want a custom size only for one cell. I have seen a lot of posts that have a programmatic solution to the problem, but I would prefer to do it through storyboard, if that is possible.


Custom Cell Row Height setting in storyboard is not responding

I&#39;m using XCode 4.2 and have built my UI using Storyboards. I need to create a view that has content above and below a UITableView and I can achieve this by using a UIViewController.  A UITableViewController does not let you add content above or below the table.  You can use the table header/footer but that doesn&#39;t work for what I would like to achieve.

I now have a UIViewController with a UITableView embedded in it.  I can adjust the height and width of the UITableView accordingly which provides me the UI layout that I am looking for.

I can customize the static cells in the UITableView but when I try to build I get the following error:

&gt;Illegal Configuration: Static table views are only valid when embedded in UITableViewController instances

My question is how are others getting around this?  Creating a tableview with static cells and laying them out visually is very nice but apparently that is not allowed for some reason that I cannot understand.  I can&#39;t switch to a UITableViewController because of my visual layout requirements.

Any assistance would be greatly appreciated.

How to visually create and use static cells in a UITableView embedded in a UIViewController

For the most part with ARC (Automatic Reference Counting), we don&#39;t need to think about memory management at all with Objective-C objects. It is not permitted to create `NSAutoreleasePool`s anymore, however there is a new syntax:

    @autoreleasepool {
        …
    }

My question is, why would I ever need this when I&#39;m not supposed to be manually releasing/autoreleasing ?


----------


**EDIT:** To sum up what I got out of all the anwers and comments succinctly:

**New Syntax:**

`@autoreleasepool { … }` is new syntax for

    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
    …
    [pool drain];

**More importantly:**

 - ARC uses `autorelease` as well as `release`.
 - It needs an auto release pool in place to do so.
 - ARC doesn&#39;t create the auto release pool for you. *However:*
  - The main thread of every Cocoa app already has an autorelease pool in it.
 - There are two occasions when you might want to make use of `@autoreleasepool`:
  1. When you are in a secondary thread and there is no auto release pool, you must make your own to prevent leaks, such as `myRunLoop(…) { @autoreleasepool { … } return success; }`.
  2. When you wish to create a more local pool, as @mattjgalloway has shown in his answer.




Why is @autoreleasepool still needed with ARC?

I keep searching, but cannot find **a clear and simple explanation on how to include one XCode project, along with all of it&#39;s sub-classes into another project.** I routinely see stuff like that in sample projects that I download off the web, but do not know how to do this myself.

Within XCode, along with .h and .m files, and folders, there&#39;s a whole new project, starting with a blue xcode project icon, that is expandable to contain everything within the project. 

Please, can someone explain to me step by step what do I need to do to add one XCode project into another one? I&#39;ve seen a ton of one liners like &quot;header search paths&quot;, but that does not tell me much. 

**UPDATE: After re-reading the documentation, I realized that the project to include must be dragged ONTO the BLUE project icon of the parent project.** Regular sources can be dragged anywhere, but a  project must be dragged onto a project.
 
Thank you!

Xcode 4.2 how include one project into another one?

I still have Snow Leopard. I have Xcode 4.2 for iOS development. This morning I upgraded my iPhone and iPad to iOS 5.1. 

But Xcode 4.2 is not detecting my device for testing. I could not find the iOS 5.1 SDK image on Apple&#39;s developer site, for Xcode 4.2.

I don&#39;t want to do upgrade to Lion to get XCode 4.3 at this time.

Will I able to use Xcode 4.2 (on Snow Leopard) for iOS development now?

Is it possible to get the iOS 5.1 SDK for Xcode 4.2 on Snow Leopard?

Can someone explain in simple words the difference between .xib and .storyboard? 

What is the difference between a .xib file and a .storyboard?

I have created a new Xcode project using Storyboards (tab view template). I added a couple of view controllers to my storyboard, and wanted to use a UITableView with static cells for one. I created it, but when I run in the simulator the cells don&#39;t appear. I haven&#39;t changed anything in the project except for this storyboard file. I am showing screenshots of the storyboard editor and the simulator running. The label shows up, so the view is loading correctly. I set the background color to gray so I can see the talbeview is loading. All cells are set to visible. I changed their style to Basic and edited the label, and added a disclosure indicator, that&#39;s all.

![simulator][1]
![xcode][2]


  [1]: http://i.stack.imgur.com/H0fNf.png
  [2]: http://i.stack.imgur.com/6oHJU.png

UITableView with static cells does not appear

Are there any guidelines on when to use storyboards in an iOS project and when to use XIBs? what are the pros and cons of each and what situations do they each suit?

Near as I can tell it&#39;s not that clean to use storyboard segues when you have view controllers being pushed by dynamic UI elements (Like map pins).

When to use Storyboard and when to use XIBs

Every time I click-and-drag a UILabel to storyboard, and then add text to Text field, the text is cut off, so I then have to click-and-drag the UILabel to stretch it big enough so that the text appears.

I can&#39;t figure out how to make the UILabel automatically get big enough to fit the text.  

This would save time while designing new views.

how to make UILabel autosize text in storyboard (or interface builder), NOT programmatically

I&#39;m trying to configure a UIPageViewController SPECIFICALLY from storyboard:

![enter image description here][1]

`TutorialPageViewController.h`

    #import &lt;UIKit/UIKit.h&gt;
    @interface TutorialPageViewController : UIPageViewController &lt;UIPageViewControllerDelegate, UIPageViewControllerDataSource&gt;
    @end

`TutorialPageViewController.m`

    #import &quot;TutorialPageViewController.h&quot;
    
    @interface TutorialPageViewController ()
    @property (assign, nonatomic) NSInteger index;
    @end
    
    @implementation TutorialPageViewController
    {
        NSArray *myViewControllers;
    }
    
    - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
    {
        self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
        if (self) {
            // Custom initialization
        }
        return self;
    }
    
    - (void)viewDidLoad
    {
        [super viewDidLoad];
    	// Do any additional setup after loading the view.
        self.delegate = self;
        self.dataSource = self;
        [self didMoveToParentViewController:self];
        UIStoryboard *tutorialStoryboard = [UIStoryboard storyboardWithName:@&quot;TutorialStoryboard&quot; bundle:[NSBundle mainBundle]];
        UIViewController *tuto1 = [tutorialStoryboard instantiateViewControllerWithIdentifier:@&quot;TutorialPageViewController_1&quot;];
        UIViewController *tuto2 = [tutorialStoryboard instantiateViewControllerWithIdentifier:@&quot;TutorialPageViewController_2&quot;];
        
        myViewControllers = @[tuto1, tuto2, tuto1, tuto2];
        self.index = 0;
        
        [self setViewControllers:@[tuto1] direction:UIPageViewControllerNavigationDirectionForward animated:NO completion:nil];
    }
    
    - (UIViewController *)viewControllerAtIndex:(NSUInteger)index {
        return myViewControllers[index];
    }
    
    - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController {
        
        NSUInteger index = self.index;
        
        if (index == 0) { return nil; }
        
        // Decrease the index by 1 to return
        index--;
        return [self viewControllerAtIndex:index];
    }
    
    - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerAfterViewController:(UIViewController *)viewController {
        
        NSUInteger index = self.index;
        index++;
        if (index &gt; [myViewControllers count]) { return nil; }
        
        return [self viewControllerAtIndex:index];
    }
    
    - (NSInteger)presentationCountForPageViewController:(UIPageViewController *)pageViewController {
        // The number of items reflected in the page indicator.
        return [myViewControllers count];
    }
    
    - (NSInteger)presentationIndexForPageViewController:(UIPageViewController *)pageViewController {
        // The selected item reflected in the page indicator.
        return 0;
    }
    
    @end


Problem is...
-------------

 - The first page displays well with the page indicator. While swiping,
 - I can see properly the second page.
 - **As soon as the transition finishes, I get a black screen (with the page indicator properly displaying page number 2). No user
   interaction is available anymore.**

  [1]: http://i.stack.imgur.com/pjrzc.png

Content Type	Original Author	Original Content on Stackoverflow
Question	sipsorcery	View Question on Stackoverflow
Solution 1 - Merge	Adam	View Answer on Stackoverflow

XCode Storyboard merging

Merge Problem Overview

Merge Solutions

Solution 1 - Merge

What are the differences between CV_8U and CV_32F and what should I worry about when converting between them?

How to recursively list directories in C on Linux?

Attributions