After all I found it, hidden in the &quot;Git Repository view&quot;:

![enter image description here][1]


  [1]: http://i.stack.imgur.com/LIhun.png

With Eclipse Mars (Egit Version 4.0.3) you can access the Stash via click on Project ==&gt; Team ==&gt; Stashes:



[![EGit Stash][1]][1]


  [1]: http://i.stack.imgur.com/Cr9rB.png

For me, the &quot;AHA&quot; moment was when I realized stashing (in EGit) happens at project level and not at file level. So I spent hours searching in the file context menu with no luck. Right click the project, and there it is...

You can also type CTRL-3 (CMD-3 on Mac) to start quick access and then type &quot;stash&quot; to find and run stash

I have been reading a lot about Singletons, when they should and shouldn&#39;t be used, and how to implement them safely.  I am writing in C++11, and have come across the Meyer&#39;s lazy initialized implementation of a singleton, as seen in [this question.][1]

This implementation is:

    static Singleton&amp; instance()
    {
         static Singleton s;
         return s;
    }

I understand how this is thread safe from other questions here on SO, but what I don&#39;t understand is how this is actually a singleton pattern.  I have implemented singletons in other languages, and these always end up something like this example from [Wikipedia][2]:

    public class SingletonDemo {
            private static volatile SingletonDemo instance = null;
     
            private SingletonDemo() {       }
     
            public static SingletonDemo getInstance() {
                    if (instance == null) {
                            synchronized (SingletonDemo .class){
                                    if (instance == null) {
                                            instance = new SingletonDemo ();
                                    }
                          }
                    }
                    return instance;
            }
    }

When I look at this second example, it is very intuitive how this is a singleton, since the class holds a reference to one instance of itself, and only ever returns that instance.  However, in the first example, I don&#39;t understand how this prevents there ever existing two instances of the object.  So my questions are:

 1. How does the first implementation enforce a singleton pattern?  I assume it has to do with the static keyword, but I am hoping that someone can explain to me in depth what is happening under the hood.
 2. Between these two implementation styles, is one preferable over the other? What are the pros and cons?

Thanks for any help,

  [1]: https://stackoverflow.com/questions/1661529/is-meyers-implementation-of-singleton-pattern-thread-safe
  [2]: http://en.wikipedia.org/wiki/Singleton_pattern

How is Meyers&#39; implementation of a Singleton actually a Singleton

We use auto layout constraints selectively, primarily to position labels in relation to editable field elements (UITextView, UITextField, typically).  However, since implementing auto layout for these fields, we&#39;re seeing a nasty exception and crash whenever we&#39;re unloading views, deallocating, etc.  The exceptions are happening as it&#39;s attempting to remove the constraints from a view before unloading it.

Our view/controller hierarchy is as such:

    UITableViewController (plain style, but with cell appearance to mimic grouped style)
    --&gt; UITableViewCell
    ----&gt; UIViewController (container for editable form)
    ------&gt; UICollectionViewController (editable form)
    --------&gt; UICollectionViewCell
    -----------&gt; UIViewController (editable field)
    --------------&gt; UILabel (field label)                   **HAS CONSTRAINTS**
    --------------&gt; UITextView / UITextField (field value)  **HAS CONSTRAINTS**

Many times when the upper level table cells are being deallocated/replaced/reloaded, we see a huge exception and then crash as it&#39;s trying to deallocate/unload the view hierarchy within.

I&#39;ve attempted to mitigate the crash by catching the exception (no help) and also by forcefully removing all of the constraints on the affected view and all of the subviews prior to deallocation/unload (in `viewWillDisappear:`) and it doesn&#39;t seem to help.  I&#39;ve even tried to remove these constraints one by one to see if there&#39;s one in particular that&#39;s causing the trouble but all of them are blowing up when we call `removeConstraint:` or `removeConstraints:` on a container in preparation for disappearing.

I&#39;m baffled! Here&#39;s a snippet of our exception -- roughly about 3000 lines have been chopped out of it, so if you need more, just ask.


    Exception while deallocating view: { Rows:
    	0x18911270.posErrorMarker == 4 + 1*0x18911270.negError + 1*0x189112f0.marker + -1*0x189113f0.negError + 1*0x189113f0.posErrorMarker + 1*0x18911a60.marker + -0.5*0x1892dae0.negError + 0.5*0x1892dae0.posErrorMarker + 1*0x18951520.negError + -1*0x18951520.posErrorMarker + -0.5*0x18958090.negError + 0.5*0x18958090.posErrorMarker
    	0x189112b0.negError == 12 + 1*0x189112b0.posErrorMarker + -1*0x189112f0.marker + 1*0x189113f0.negError + -1*0x189113f0.posErrorMarker + -1*0x18911a60.marker + 1*0x18925530.marker + 0.5*0x1892dae0.negError + -0.5*0x1892dae0.posErrorMarker + 1*0x1893e080.marker + 0.5*0x18958090.negError + -0.5*0x18958090.posErrorMarker + 1*0x18963640.marker
    	0x18911370.negError == 9 + -1*0x189112f0.marker + 1*0x18911370.posErrorMarker + 1*0x18925530.marker + 1*0x1892dae0.negError + -1*0x1892dae0.posErrorMarker + 1*0x1893e080.marker + 1*0x18963640.marker
    	0x189113b0.slackMarker == 2 + -1*0x189107d0.marker + 1*0x18910b90.negError + -1*0x18910b90.posErrorMarker + 
      
          ........ EXPLETIVES DELETED .........
         
       UITableView:0xca2b000.contentHeight == 36 + 1*0xc221c00.marker
       UITableView:0xca2b000.contentWidth == 704 + 1*0xc239470.marker
       UITableView:0xca2b000.minX == 0 + 1*0xc2a23f0.marker + -0.5*0xc2a2590.marker
       UITableView:0xca2b000.minY == 0 + 1*0xc2a25d0.marker + -0.5*0xc2a2630.marker
       UITableViewCellContentView:0x18ab13d0.Height == 174 + 1*0x18abd4f0.marker
       UITableViewCellContentView:0x18ab13d0.Width == 704 + 1*0x18abd470.marker
      
          ........ EXPLETIVES DELETED .........
         
    	&lt;NSAutoresizingMaskLayoutConstraint:0x18988bc0 h=-&amp;- v=-&amp;- UIView:0x18911e50.midY == UIView:0x1892d0c0.midY&gt;		Marker:0x18988bc0.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0x18994b40 h=-&amp;- v=-&amp;- UIView:0xc4a6fb0.midX == UIView:0xc4b4990.midX&gt;		Marker:0x18994b40.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0x18998480 h=-&amp;- v=-&amp;- UIView:0x18915180.width == UIView:0xc4c5970.width&gt;		Marker:0x18998480.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0x18aae320 h=--&amp; v=--&amp; TapSectionalTableViewCell:0x18a3d270.midX == + 352&gt;		Marker:0x18aae320.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0x18aae410 h=--&amp; v=--&amp; H:[TapSectionalTableViewCell:0x18a3d270(704)]&gt;		Marker:0x18aae410.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0x18aae450 h=--&amp; v=--&amp; TapSectionalTableViewCell:0x18a3d270.midY == + 144&gt;		Marker:0x18aae450.marker
      
          ........ EXPLETIVES DELETED .........
         
    	&lt;NSAutoresizingMaskLayoutConstraint:0xc2de2f0 h=--&amp; v=--&amp; TapGenericCollectionCell:0xc2ac500.midX == + 499&gt;		Marker:0xc2de2f0.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0xc2de3b0 h=--&amp; v=--&amp; V:[TapGenericCollectionCell:0xc2ac500(34)]&gt;		Marker:0xc2de3b0.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0xc2de430 h=-&amp;- v=-&amp;- UIView:0x18953f80.height == UIView:0xc2acb20.height&gt;		Marker:0xc2de430.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0xc2de520 h=-&amp;- v=-&amp;- UIView:0x18923af0.height == UIView:0xc2ae570.height&gt;		Marker:0xc2de520.marker
    	&lt;NSAutoresizingMaskLayoutConstraint:0xc2de560 h=--&amp; v=--&amp; H:[TapGenericCollectionCell:0xc2ac500(280)]&gt;		Marker:0xc2de560.marker
      
          ........ EXPLETIVES DELETED .........
         
    	&lt;NSContentSizeLayoutConstraint:0xc2f5730 H:[_UIBaselineLayoutStrut:0x18994a30(0)] Hug:250 CompressionResistance:750&gt;		Marker:0xc2f5730.posErrorMarker
    	&lt;NSContentSizeLayoutConstraint:0xc2f5730 H:[_UIBaselineLayoutStrut:0x18994a30(0)] Hug:250 CompressionResistance:750&gt;		Marker:0xc2f5730.posErrorMarker
    	&lt;NSContentSizeLayoutConstraint:0xc2f5770 V:[_UIBaselineLayoutStrut:0x18994a30(18)] Hug:250 CompressionResistance:750&gt;		Marker:0xc2f5770.posErrorMarker

    internal error.  Cannot find an outgoing row head for incoming head UIView:0x189712b0.Width, which should never happen.&#39;


&lt;!-- language: lang-m --&gt;

    /**** BEGIN Individual Field Controller - This code is from the base individual field controller used in our editable form collection *****/

    - (void)viewDidLoad {
        [super viewDidLoad];
        self.view.clipsToBounds = YES;
        self.view.opaque = YES;

        CGRect viewFrame = self.view.frame;
        viewFrame.size = [self defaultFieldSize];
        self.view.frame = viewFrame;
     
        if (self.backgroundColor) {
            self.view.backgroundColor = self.backgroundColor;
        }
        else {
            self.view.backgroundColor = [UIColor whiteColor];
        }
        [self createLabelAndField];

        [self setLabelAndFieldContraints];

        [self.view addConstraints:self.labelValueConstraints];
        [self.view setNeedsUpdateConstraints];
    }

    - (void)createLabelAndField {
        [self removeLabelAndField];

        UILabel *label = [[UILabel alloc] init];
        label.font = self.labelFont;
        label.textColor = self.labelColor;
        label.lineBreakMode = NSLineBreakByWordWrapping;
        label.textAlignment = NSTextAlignmentLeft;
        label.adjustsFontSizeToFitWidth = NO;
        label.numberOfLines = 0;
 
        if (self.backgroundColor) {
            label.backgroundColor = self.backgroundColor;
        }
        else {
            label.backgroundColor = [UIColor whiteColor];
        }

        [self.view addSubview:label];

        self.label = label;
 
 
        /// EXAMPLE valueView initialization from a subclass that handles long text
 
        TapEditableTextView *textView = [[TapEditableTextView alloc] init];
        if (self.hasLabelOverValue) {
            textView.shouldMimicTextField = NO;
        }
        else {
            textView.shouldMimicTextField = YES;
        }
        textView.delegate = self;
        textView.keyboardType = UIKeyboardTypeDefault;
        textView.font = self.valueFont;
        textView.textColor = self.valueColor;
        textView.textAlignment = NSTextAlignmentLeft;
        textView.normalBackgroundColor = self.backgroundColor;
        textView.editable = NO;
        textView.textLines = self.textLines;

        self.valueTextView = textView;
        self.valueView = textView;
        [self.view addSubview:textView];
    }

    - (void)removeLabelAndField {
        [self clearConstraints];

        if (self.label) {
            [self.label removeFromSuperview];
            self.label = nil;
        }
        if (self.valueView) {
            [self.valueView removeFromSuperview];
            self.valueView = nil;
        }
    }

    - (void)clearConstraints {
        if (self.isViewLoaded &amp;&amp; self.labelValueConstraints) {
            [self.view removeConstraints:self.labelValueConstraints];
        }
        self.labelValueConstraints = nil;
        self.labelToValueHorizConstraint = nil;
        self.valueWidthConstraint = nil;
    }

    // This is called in our field&#39;s viewDidLoad, after we&#39;ve created our label and valueView (UITextField, UITextView, etc)
    - (void)setLabelAndFieldContraints {
        [self clearConstraints];

        self.labelValueConstraints = [NSMutableArray array];

        self.label.translatesAutoresizingMaskIntoConstraints = NO;
        self.valueView.translatesAutoresizingMaskIntoConstraints = NO;

        NSLayoutConstraint *constraint = nil;

        constraint = [NSLayoutConstraint
                      constraintWithItem:self.label attribute:NSLayoutAttributeLeft
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeLeft
                      multiplier:1.0f constant:self.labelValueGap];
        constraint.priority = UILayoutPriorityRequired;
        [self.labelValueConstraints addObject:constraint];


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.label attribute:NSLayoutAttributeTop
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeTop
                      multiplier:1.0f constant:0];
        constraint.priority = 550;
        [self.labelValueConstraints addObject:constraint];


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.label attribute:NSLayoutAttributeBottom
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeBottom
                      multiplier:1.0f constant:0];
        constraint.priority = 400;
        [self.labelValueConstraints addObject:constraint];


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.valueView attribute:NSLayoutAttributeTop
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeTop
                      multiplier:1.0f constant:0];
        constraint.priority = UILayoutPriorityRequired;
        [self.labelValueConstraints addObject:constraint];


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.valueView attribute:NSLayoutAttributeBottom
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeBottom
                      multiplier:1.0f constant:0];
        constraint.priority = 499;
        [self.labelValueConstraints addObject:constraint];

 
         constraint = [NSLayoutConstraint
                      constraintWithItem:self.valueView attribute:NSLayoutAttributeRight
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeRight
                      multiplier:1.0f constant: -(kDisclosureWidth + self.labelValueGap) ];
         constraint.priority = 901;
         [self.labelValueConstraints addObject:constraint];


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.valueView attribute:NSLayoutAttributeLeading
                      relatedBy:NSLayoutRelationGreaterThanOrEqual
                      toItem:self.label attribute:NSLayoutAttributeTrailing
                      multiplier:1.0f constant:self.labelValueGap];
        constraint.priority = UILayoutPriorityDefaultHigh + 1;
        [self.labelValueConstraints addObject:constraint];
        self.labelToValueHorizConstraint = constraint;


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.label attribute:NSLayoutAttributeBaseline
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.valueView attribute:NSLayoutAttributeBaseline
                      multiplier:1.0f constant:0.f];
        constraint.priority = 600;
        [self.labelValueConstraints addObject:constraint];


        constraint = [NSLayoutConstraint
                      constraintWithItem:self.valueView attribute:NSLayoutAttributeWidth
                      relatedBy:NSLayoutRelationEqual
                      toItem:self.view attribute:NSLayoutAttributeWidth
                      multiplier:(1.f - self.labelWidthPercentage) constant:0];
        constraint.priority = 305;
        [self.labelValueConstraints addObject:constraint];
        self.valueWidthConstraint = constraint;


        [self setCompressionAndHuggingForLabelView:self.label];
        [self setCompressionAndHuggingForValueView:self.valueView];
    }

    - (void)setCompressionAndHuggingForLabelView:(UILabel *)labelView {
        if (!labelView) {
            return;
        }
        [labelView setContentCompressionResistancePriority:510 forAxis:UILayoutConstraintAxisHorizontal];
        [labelView setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisVertical];
        [labelView setContentHuggingPriority:450 forAxis:UILayoutConstraintAxisHorizontal];
        [labelView setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisVertical];
    }

    - (void)setCompressionAndHuggingForValueView:(UIView *)valueView {
        if (!valueView) {
            return;
        }
        [valueView setContentCompressionResistancePriority:509 forAxis:UILayoutConstraintAxisHorizontal];
        [valueView setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisVertical];
        [valueView setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];
        [valueView setContentHuggingPriority:650 forAxis:UILayoutConstraintAxisVertical];
    }

    /****** END Individual Field Controller ******/




AutoLayout: removeFromSuperview / removeConstraints throws exception and crashes hard

I&#39;m working with Eclipse Kepler and EGit 3.0.0. Where can I find the GIT stash/apply functionality.

I cannot find stash in the package explorer team pop-up nor anywhere in the *Team Synchronizing* perspective.


Unable to find stash/apply functionalitit in EGit

I'm working with Eclipse Kepler and EGit 3.0.0. Where can I find the GIT stash/apply functionality.
I cannot find stash in the package explorer team pop-up nor anywhere in the Team Synchronizing perspective.

I am sure this question has been asked number of times because I read a few. My client wants me to put a button into his app where users can click and exit. I have read [this][1] and found calling `finish()` will do it. But, finish is only closing the current running activity right? I have lot of activities so in this case I have to pass each and every activity&#39;s instance and finish them or make every activity into Singleton pattern. 

I also got to know `Activity.moveTaskToBack(true)` can get you into the home screen. OK, this is not closing but backgrounding the process. So is this is effective?

Which method should I use to close the app completely? Any of above described or any other method/other usage of above methods?

  [1]: https://stackoverflow.com/questions/2033914/quitting-an-application-is-that-frowned-upon/2034238

How to exit an Android app programmatically?

I want to add latest tomcat-7.0.42 in my eclipse. Probably eclipse tomcat server adapter 7 only supports tomcat version upto 7.0.12 .. 



![enter image description here][1]


  [1]: http://i.stack.imgur.com/ulxtl.png

So please help me how can I configure my eclipse with tomcat-7.0.42

Unknown version of Tomcat was specified in Eclipse

I&#39;m using Eclipse Juno on Mac 10.7.5, SVN 1.7 and the Eclipse Subversive plugin.  Occassioanlly, when I try and commit changes from my project (by right clicking on the project from the package explorer, selecting &quot;Team&quot; -&gt; &quot;Commit&quot;), I get the error:

	Some of selected resources were not committed.
	Some of selected resources were not committed.
	svn: E200007: Commit failed (details follow):

	svn: E200007: Commit failed (details follow):
	svn: E200007: CHECKOUT can only be performed on a version resource [at this time].
	svn: E175002: CHECKOUT request failed on &#39;/svn/subco-digital.coderepo/!svn/rvr/2110/trunk/myproject/src/main/java/org/mainco/subco/myproject/validator/UserFormValidator.java&#39;

I have verified that I have checked out the latest version of my project.  How can I take care of these repeated errors?  

Getting &quot;CHECKOUT can only be performed on a version resource&quot; when trying to commit using Eclipse subversive plugin

I&#39;m starting to develop for Android. Which IDE should I use - Android Studio or Eclipse sdk?
I would like to know which one is better.

Which Android IDE is better - Android Studio or Eclipse?

**EDIT 2014-02-07: Eclipse Luna is here, and support for Tomcat 8 is included in the bundled WTP : ) Happy days!**

Tomcat 8 is still in development, but you can get it [here][1]. Now there is a RC version on the main Apache Tomcat page. Update 2/27/14: 8 is released now, and adapters built for WTP, just not integrated into eclipse bundles yet. Soon!

In Eclipse Kepler though, there is no supported adapter in the add server list for Tomcat 8. the Tomcat 7 adapter doesn&#39;t work, and it doesn&#39;t look like there&#39;s a new extension for it to download in the &quot;Install new Extension&quot; dialog.

Is my only option to get it (Tomcat 8) running locally outside of Eclipse and maybe hook a remote debugger into it for stepping through code? Will that even work for Eclipse Kepler + Tomcat 8? IntelliJ IDEA 12 couldn&#39;t do it in the 30 minutes of time I put into that path.

If you&#39;re wondering why I&#39;m trying to do this at all, I&#39;m playing around with Spring 4.0.0.M1 and 4.0.0.M2 WebSocket stuff. They (per Rossen Stoyanchev&#39;s Spring 4.0 [blog post][3] and examples) use JSR-356, which is implemented in Tomcat 8, theoretically to be back-ported at some point to Tomcat 7.

An answer to the broader question of &quot;How can I easily get a development environment going for Spring 4 WebSocket support?&quot; would be nice, but it would also still be nice to know how to plug in unsupported web servers to Eclipse.

Cheers,
E

**Update 8/7/13 - Rossen Stoyanchev updated the Spring [4.0.0.M2 blog][4] and added some jpda wisdom and shared that yeah, he&#39;s using remote debugging:

&gt;That said, it&#39;s not very hard to debug with Tomcat 8 inside Eclipse. Just change the last line in bin/startup.sh to be (note the addition of &quot;jpda&quot;):
&gt;
     exec &quot;$PRGDIR&quot;/&quot;$EXECUTABLE&quot; jpda start &quot;$@&quot;

&gt;Inside Eclipse create a remote debugging configuration for localhost port 80, launch it after starting Tomcat, and you can put breakpoints in the source code.

Thanks Rossen!

**Update 9/29/13 - Eclipse Kepler SR1 just arrived, but alas! No WTP support for Tomcat 8. Tomcat 8 is up to RC3.

**Updates 12/5/13 

 - Blog url fix.
 - Tomcat 8 up to RC5.
 - Bug to track WTP fix in Eclipse to support Tomcat 8 [HERE][5].
 - IntelliJ IDEA new version 13 says it now supports Tomcat 8. Haven&#39;t tried yet personally.
 

  [1]: https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/tomcat/8.0-SNAPSHOT/
  [3]: http://blog.springsource.org/2013/05/23/spring-framework-4-0-m1-websocket-support/
  [4]: http://blog.springsource.org/2013/07/24/spring-framework-4-0-m2-websocket-messaging-architectures
  [5]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=422340

How to use Tomcat 8 in Eclipse?

I&#39;m starting to play with Git now and I&#39;m a little bit confused. For me, looks like there are a lot of options to do the same thing. My question for now is what is the difference between the commands below:

- git remote update
- git fetch
- git pull

Also which one is more applicable for update a local copy of a remote branch?

What is the difference between &#39;git remote update&#39;, &#39;git fetch&#39; and &#39;git pull&#39;?

I cloned a repo using the

`git clone -b &lt;branch name&gt; --single-branch &lt;github url&gt; &lt;target directory&gt;`

This cloned ONLY this branch, but now I want to switch to the master and other branches.  Is there any way besides clearing it out and starting over to clone the rest of the repo that I can undo the --single-branch preference?

How do I &quot;undo&quot; a --single-branch clone?

I am using source tree. I had created a stash of multiple changes and by mistake deleted it. Is there a way to retrieve them back?

Retrieve deleted stash in Git using SourceTree

I am trying to add a branch to the master branch on GitHub and push a folder onto that branch.

The folder structure of the branch looks like -
SocialApp/SourceCode/DevTrunk/SocialApp and all the source code files are in the last folder.

I am using the following Git commands:

    git add *
    git commit -m with the message
    git push

This is pushing only the first folder &quot;SocialApp&quot; onto GitHub and ignoring the folder SourceCode that is inside the folder. How do I fix this?

Recursively add the entire folder to a repository

I&#39;ve noticed that I have two listings for `core.autocrlf` when I run `git config -l`

    $ git config -l
    core.symlinks=false
    core.autocrlf=false
    color.diff=auto
    color.status=auto
    color.branch=auto
    color.interactive=true
    pack.packsizelimit=2g
    help.format=html
    http.sslcainfo=/bin/curl-ca-bundle.crt
    sendemail.smtpserver=/bin/msmtp.exe
    diff.astextplain.textconv=astextplain
    rebase.autosquash=true
    user.name=name
    user.email=email@example.com
    core.autocrlf=true

Those last three (from user.name down) are the only ones in my `C:\users\username\.gitconfig` file. Where are all of the other ones coming from?  Why is core.autocrlf listed twice?

This is with MSysGit 1.8.3, and I also have Sourcetree installed (Windows&amp;nbsp;7). In Sourcetree I have unchecked the &quot;Allow Sourcetree to modify your global Git config files&quot;





Where do the settings in my Git configuration come from?

I am not able to clone or push to a git repository at Bitbucket in Eclipse:

![Error &#39;cannot open git-upload-pack&#39;][1]

It&#39;s weird, because a day before I didn&#39;t have any problem. I have downloaded the sts 3 times with no luck. This error keeps showing. Also I have installed SourceTree and it says &#39;This is not a valid source path / URL&#39;:

![Error &#39;This is not a valid source path / URL&#39; in sourcetree][2]

If I use git commands to import the project, it works, but I wan&#39;t to use EGit for this task, since I am a newbie with git. 

I don&#39;t know if this has to do with it, but in the same directory I have the android-adt-bundle. This one works pretty well, but the project lies on GitHub and not Bitbucket. Also, I&#39;m working with another person and he is able to fetch and push data from and to the Bitbucket repository. I have read lots of posts but none of them have helped me out. 

I&#39;m using Windows 7 btw.


  [1]: http://i.stack.imgur.com/N2Lu8.png
  [2]: http://i.stack.imgur.com/5a7e1.png

&#39;cannot open git-upload-pack&#39; error in Eclipse when cloning or pushing git repository

I am getting this message while pushing to github repository.  Can you tell me step by step procedure to fix it?  I pushed only once and it was successful. But, when I updated a project and tried to push my second commit, it shows &quot;master rejected non-fast-forward&quot; and does not allow me to push.  Please explain the procedure.


Egit rejected non-fast-forward

I am using EGit on [Eclipse&amp;nbsp;v4.3][1] (Kepler). I want to commit and push my changes. I do a pull first and one file is conflicting. After manually resolving the conflict (local and remote are the same now), I am still running into problems.

Here are the error messages for each action:

Push to upstream

&gt; master: master [rejected - non-fast-forward]

Pull

&gt; Cannot pull into a repository with state: MERGING_RESOLVED

Mark as merged

&gt; Failed to add resource to index Failed to add resource to index Exception caught during execution of add command

Hard reset

&gt; An internal error occurred during: &quot;Resetting to refs/heads/master&quot;.
Exception caught during execution of reset command. {0}

How can I remove the conflict and push my changes? What am I doing wrong?

  [1]: https://en.wikipedia.org/wiki/Eclipse_%28software%29#Releases




How to resolve conflicts in EGit

Is there a `git stash` command that stashes your changes, but keeps them in the working directory too? So basically a `git stash; git stash apply` in one step?

Stash changes while keeping the changes in the working directory in Git

I had to quickly switch git branches, so I ran `git stash`, but I had to run it again because one of my files needed editing.

So I&#39;ve run `git stash` twice, and I&#39;m ready to go back to editing my files. I ran `git stash apply` but I&#39;m not convinced that all of the files I had stashed were unstashed. Is there anything I can do? Any way to check? 

When I run `git stash show`, I just see the last of my two git stashes.

Is there anyway to show all `git stashes`?

Git stash twice

I had some uncommitted changes in my development branch and I stashed them using `git stash`, but there were some changes which were very important among those stashed ones. Is there any way to get back those changes?


Also, I have made some changes on top of the stashed code files since.  

Is there any chance I can retrieve the stashed changes to a new branch if possible?

How to recover stashed uncommitted changes

So I had a load of changes and some untracked files. I needed to tweak something, so I used `git stash -u`, modified a couple of things, committed those changes, pushed them, and then tried to `git stash pop`.

Because I&#39;d modified a couple of files that I&#39;d stashed, I got the following message:

    error: Your local changes to the following files would be overwritten by merge:
    	file_1.py
    	file_2.py
    Please, commit your changes or stash them before you can merge.
    Aborting

This seems odd, I had committed all new changes, my checkout was clean when I ran the command.

It seems the `git stash pop` operation un-stashed half of my changes and the untracked files, but if I try and `git stash pop` again I get output like:

    some_file.html already exists, no checkout
    some_other_file.html already exists, no checkout
    yet_another_file.html already exists, no checkout
    Could not restore untracked files from stash

`git stash show` still shows a list of my stashed changes, but I&#39;m at a loss as to what I do now.

How can I get myself unstuck?

Can&#39;t pop git stash, &#39;Your local changes to the following files would be overwritten by merge&#39;

Suppose two set of changes are made in a project versioned by git. One set is staged and the other is not.

I would like to recheck staged changes by running my project at this state (before commit). **What is a simple way to put away all unstaged changes and leave only staged?** So I need unstaged changes to disappear from my project, but to be stored somewhere for further work.

This is sounds very much like `git stash` command. But `git stash` would put both unstaged and staged changes away from my project. And I can&#39;t find something like `git stash uncached`.

Content Type	Original Author	Original Content on Stackoverflow
Question	BetaRide	View Question on Stackoverflow
Solution 1 - Eclipse	BetaRide	View Answer on Stackoverflow
Solution 2 - Eclipse	hinneLinks	View Answer on Stackoverflow
Solution 3 - Eclipse	Samuel	View Answer on Stackoverflow
Solution 4 - Eclipse	Matthias Sohn	View Answer on Stackoverflow

Unable to find stash/apply functionalitit in EGit

Eclipse Problem Overview

Eclipse Solutions

Solution 1 - Eclipse

Solution 2 - Eclipse

Solution 3 - Eclipse

Solution 4 - Eclipse

AutoLayout: removeFromSuperview / removeConstraints throws exception and crashes hard

How is Meyers' implementation of a Singleton actually a Singleton

Attributions