Try using https://stackoverflow.com/questions/89332/recover-dropped-stash-in-git to find the stash you popped.  I think there are always two commits for a stash, since it preserves the index and the working copy (so often the index commit will be empty).  Then `git show` them to see the diff and use `patch -R` to unapply them.

From `git stash --help`

    Recovering stashes that were cleared/dropped erroneously
       If you mistakenly drop or clear stashes, they cannot be recovered through the normal safety mechanisms. However, you can try the
       following incantation to get a list of stashes that are still in your repository, but not reachable any more:

           git fsck --unreachable |
           grep commit | cut -d\  -f3 |
           xargs git log --merges --no-walk --grep=WIP

This helped me better than the accepted answer with the same scenario.

If your merge was not too complicated another option would be to:

 1. Move all the changes including the merge changes back to stash using &quot;git stash&quot;
 2. Run the merge again and commit your changes (without the changes from the dropped stash)
 3. Run a &quot;git stash pop&quot; which should ignore all the changes from your previous merge since the files are identical now. 

After that you are left with only the changes from the stash you dropped too early.

I&#39;d like to do the following:

    raise HttpResponseForbidden()

But I get the error:

    exceptions must be old-style classes or derived from BaseException, not HttpResponseForbidden

How should I do this?

How do I raise a Response Forbidden in django

&lt;h2&gt;The problem:&lt;/h2&gt;
Getting the user&#39;s current location within a threshold ASAP and at the same time conserve battery.

&lt;h2&gt;Why the problem is a problem:&lt;/h2&gt;
First off, android has two providers; network and GPS. Sometimes network is better and sometimes the GPS is better.

By &quot;better&quot; I mean speed vs. accuracy ratio.  
I&#39;m willing to sacrifice a few meters in accuracy if I can get the location almost instant and without turning on the GPS.

Secondly, if you request updates for location changes nothing is sent if the current location is stable.

Google has an example of determining the &quot;best&quot; location here: http://developer.android.com/guide/topics/location/obtaining-user-location.html#BestEstimate  
But I think it&#39;s no where near as good as it should/could be.

I&#39;m kind of confused why google hasn&#39;t a normalized API for location, the developer shouldn&#39;t have to care where the location is from, you should just specify what you want and the phone should choose for you.

&lt;h2&gt;What I need help with:&lt;/h2&gt;
I need to find a good way to determine the &quot;best&quot; location, maybe though some heuristic or maybe through some 3rd party library.

&lt;b&gt;This does not mean determine the best provider!&lt;/b&gt;  
I&#39;m probably gonna use all providers and picking the best of them.

&lt;h2&gt;Background of the app:&lt;/h2&gt;
The app will collect the user&#39;s location at a fixed interval (let say every 10 minutes or so) and send it to a server.  
The app should conserve as much battery as possible and the location should have X (50-100?) meters accuracy.

The goal is to later be able to plot the user&#39;s path during the day on a map so I need sufficient accuracy for that.

&lt;h2&gt;Misc:&lt;/h2&gt;
What do you think are reasonable values on desired and accepted accuracies?  
I&#39;ve been using 100m as accepted and 30m as desired, is this to much to ask?  
I&#39;d like to be able to plot the user&#39;s path on a map later.  
Is 100m for desired and 500m for accepted better?

Also, right now I have the GPS on for a maximum of 60 seconds per location update, is this too short to get a location if you&#39;re indoors with an accuracy of maybe 200m?

---

This is my current code, any feedback is appreciated (apart from the lack of error checking which is TODO):

	protected void runTask() {
		final LocationManager locationManager = (LocationManager) context
				.getSystemService(Context.LOCATION_SERVICE);
		updateBestLocation(locationManager
				.getLastKnownLocation(LocationManager.GPS_PROVIDER));
		updateBestLocation(locationManager
				.getLastKnownLocation(LocationManager.NETWORK_PROVIDER));
		if (getLocationQuality(bestLocation) != LocationQuality.GOOD) {
			Looper.prepare();
			setLooper(Looper.myLooper());
			// Define a listener that responds to location updates
			LocationListener locationListener = new LocationListener() {

				public void onLocationChanged(Location location) {
					updateBestLocation(location);
					if (getLocationQuality(bestLocation) != LocationQuality.GOOD)
						return;
					// We&#39;re done
					Looper l = getLooper();
					if (l != null) l.quit();
				}

				public void onProviderEnabled(String provider) {}

				public void onProviderDisabled(String provider) {}

				public void onStatusChanged(String provider, int status,
						Bundle extras) {
					// TODO Auto-generated method stub
					Log.i(&quot;LocationCollector&quot;, &quot;Fail&quot;);
					Looper l = getLooper();
					if (l != null) l.quit();
				}
			};
			// Register the listener with the Location Manager to receive
			// location updates
			locationManager.requestLocationUpdates(
					LocationManager.GPS_PROVIDER, 1000, 1, locationListener,
					Looper.myLooper());
			locationManager.requestLocationUpdates(
					LocationManager.NETWORK_PROVIDER, 1000, 1,
					locationListener, Looper.myLooper());
			Timer t = new Timer();
			t.schedule(new TimerTask() {

				@Override
				public void run() {
					Looper l = getLooper();
					if (l != null) l.quit();
					// Log.i(&quot;LocationCollector&quot;,
					// &quot;Stopping collector due to timeout&quot;);
				}
			}, MAX_POLLING_TIME);
			Looper.loop();
			t.cancel();
			locationManager.removeUpdates(locationListener);
			setLooper(null);
		}
		if (getLocationQuality(bestLocation) != LocationQuality.BAD) 
			sendUpdate(locationToString(bestLocation));
		else Log.w(&quot;LocationCollector&quot;, &quot;Failed to get a location&quot;);
	}

	private enum LocationQuality {
		BAD, ACCEPTED, GOOD;

		public String toString() {
			if (this == GOOD) return &quot;Good&quot;;
			else if (this == ACCEPTED) return &quot;Accepted&quot;;
			else return &quot;Bad&quot;;
		}
	}

	private LocationQuality getLocationQuality(Location location) {
		if (location == null) return LocationQuality.BAD;
		if (!location.hasAccuracy()) return LocationQuality.BAD;
		long currentTime = System.currentTimeMillis();
		if (currentTime - location.getTime() &lt; MAX_AGE
				&amp;&amp; location.getAccuracy() &lt;= GOOD_ACCURACY)
			return LocationQuality.GOOD;
		if (location.getAccuracy() &lt;= ACCEPTED_ACCURACY)
			return LocationQuality.ACCEPTED;
		return LocationQuality.BAD;
	}

	private synchronized void updateBestLocation(Location location) {
		bestLocation = getBestLocation(location, bestLocation);
	}

	// Pretty much an unmodified version of googles example
	protected Location getBestLocation(Location location,
			Location currentBestLocation) {
		if (currentBestLocation == null) {
			// A new location is always better than no location
			return location;
		}
		if (location == null) return currentBestLocation;
		// Check whether the new location fix is newer or older
		long timeDelta = location.getTime() - currentBestLocation.getTime();
		boolean isSignificantlyNewer = timeDelta &gt; TWO_MINUTES;
		boolean isSignificantlyOlder = timeDelta &lt; -TWO_MINUTES;
		boolean isNewer = timeDelta &gt; 0;
		// If it&#39;s been more than two minutes since the current location, use
		// the new location
		// because the user has likely moved
		if (isSignificantlyNewer) {
			return location;
			// If the new location is more than two minutes older, it must be
			// worse
		} else if (isSignificantlyOlder) {
			return currentBestLocation;
		}
		// Check whether the new location fix is more or less accurate
		int accuracyDelta = (int) (location.getAccuracy() - currentBestLocation
				.getAccuracy());
		boolean isLessAccurate = accuracyDelta &gt; 0;
		boolean isMoreAccurate = accuracyDelta &lt; 0;
		boolean isSignificantlyLessAccurate = accuracyDelta &gt; 200;
		// Check if the old and new location are from the same provider
		boolean isFromSameProvider = isSameProvider(location.getProvider(),
				currentBestLocation.getProvider());
		// Determine location quality using a combination of timeliness and
		// accuracy
		if (isMoreAccurate) {
			return location;
		} else if (isNewer &amp;&amp; !isLessAccurate) {
			return location;
		} else if (isNewer &amp;&amp; !isSignificantlyLessAccurate
				&amp;&amp; isFromSameProvider) {
			return location;
		}
		return bestLocation;
	}

	/** Checks whether two providers are the same */
	private boolean isSameProvider(String provider1, String provider2) {
		if (provider1 == null) {
			return provider2 == null;
		}
		return provider1.equals(provider2);
	}

Good way of getting the user&#39;s location in Android

I stashed some local changes before doing a complicated merge, did the merge, then stupidly forgot to commit before running `git stash pop`.  The pop created some problems (bad method calls in a big codebase) that are proving hard to track down.  I ran `git stash show`, so I at least know which files were changed. If nothing else, I guess this is a lesson to commit more.

My question: is it possible to undo the stash pop without also undoing the merge?   

Undoing accidental git stash pop

<p>I stashed some local changes before doing a complicated merge, did the merge, then stupidly forgot to commit before running <code>git stash pop</code>.  The pop created some problems (bad method calls in a big codebase) that are proving hard to track down.  I ran <code>git stash show</code>, so I at least know which files were changed. If nothing else, I guess this is a lesson to commit more.</p>
<p>My question: is it possible to undo the stash pop without also undoing the merge?</p>


I&#39;m using git to sync to phonegap while testing on the phone&#39;s native browser. As such I have the following line:

    var isPhoneGap = false;

Obviously I change this when building, but is there any way I can set up git to ignore this one line or do I have to go and put it in its own file and ignore it that way?

I&#39;m using Gitx and the terminal on OSX 10.6.

Can git ignore a specific line?

http://norbauer.com/notebooks/code/notes/git-revert-reset-a-single-file

I have found a post. 

But still don&#39;t know what is the difference between

1. `git checkout &lt;filename&gt;`

2. `git checkout -- &lt;filename&gt;`

In what situation I should use first one and second one respectively?

Difference between &quot;git checkout &lt;filename&gt;&quot; and &quot;git checkout -​- &lt;filename&gt;&quot;

I&#39;m using Git for Xcode 4 project version control.  I&#39;ve explicitly added `ProjectFolder.xcodeproj/project.xcworkspace/xcuserdata/myUserName.xcuserdatad/UserInterfaceState.xcuserstate` to `.gitignore`, but Git it won&#39;t ignore it.  Any ideas why this is so?

Can&#39;t ignore UserInterfaceState.xcuserstate

I cloned a Git repository from my GitHub account to my PC.

I want to work with both my PC and laptop, but with one GitHub account.

When I try to push to or pull from GitHub using my PC, it requires a username and password, but not when I&#39;m using the&#160;laptop!

I don&#39;t want to type my username and password every time I interact with&#160;`origin`. What am I missing&#160;here?

Git push requires username and password

I don&#39;t want to rename a remote branch, as described in *https://stackoverflow.com/questions/1526794/rename-master-branch-for-both-local-and-remote-git-repositories?answertab=votes#tab-top*.

How can I rename a local branch which hasn&#39;t been pushed to a remote repository?

In case you need to rename a **remote** branch as well:  
*https://stackoverflow.com/questions/30590083/how-to-rename-a-remote-git-branch-name/30590238#30590238*

  [1]: https://stackoverflow.com/questions/1526794/git-rename-remote-branch



How do I rename a local Git branch?

I would like to use this workflow:

1. Stage some changes.
2. Save the unstaged changes to the stash.
3. Do some stuff with the things in stage (build, test, etc.).
4. Commit.
5. Restore the unstaged changes.

Is there a way to do step 2?

Example:

```
git init
echo one &gt;file
git add file
git commit
echo two &gt;&gt;file
git add file
echo three &gt;&gt;file
git stash push
test
git commit
git stash pop
```

How to stash only unstaged changes in Git?

How can I see the changes un-stashing will make to the current working tree? I would like to know what changes will be made before applying them!

Git diff against a stash

As [asked in this question][1], I also want to know how to resolve a conflicting `git stash pop` without adding all modifications to a commit (just like &quot;git stash pop&quot; without a conflict does).

My current approach is very uncool because I do it this way:

&lt;!-- language-all: lang-sh --&gt;

```
git stash pop  # -&gt; CONFLICT
git stash drop
# [resolve conflict]
# [add conflict files]
git reset HEAD # &lt;all files that are in commit-mode&gt;
```

---
**How to reproduce:**

    mkdir foo; cd foo; git init
    echo &quot;1&quot; &gt; one
    echo &quot;2&quot; &gt; two
    git add -A; git commit -m &quot;first&quot;
    echo &quot;1.1&quot; &gt; one
    echo &quot;2.1&quot; &gt; two
    git stash
    echo &quot;2.2&quot; &gt; two
    git commit -a -m &quot;second&quot;
    echo &quot;Only this file would stay in HEAD without the conflict&quot; &gt; third
    git add third
    git stash pop
    git status

  [1]: https://stackoverflow.com/q/7517124/11343

2016-06-27: Added a new file called &#39;third&#39; to the example to show that workarounds like the solution from scy only work for empty HEADs but don&#39;t fix the initial problem that the HEAD doesn&#39;t have the same content like for a `git stash pop` without a conflict.

How to resolve git stash conflict without commit?

How can I diff my current working copy against a stash?

My use case: my working copy already contains a subset of the changes in my `stash@{0}`, but I don&#39;t want to apply _all_ the changes in `stash@{0}`. I want to do a diff to help determine which desirable changes in `stash@{0}` are still missing from my working copy.

Can git do a diff of the working copy with stash

I have a stash saved for the future that I want to give a meaningful name. While it&#39;s possible to pass a message as argument to `git stash save`, is there a way to add a message to an existing stash?

Content Type	Original Author	Original Content on Stackoverflow
Question	nren	View Question on Stackoverflow
Solution 1 - Git	Ben Jackson	View Answer on Stackoverflow
Solution 2 - Git	kachar	View Answer on Stackoverflow
Solution 3 - Git	markus	View Answer on Stackoverflow

Undoing accidental git stash pop

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Good way of getting the user's location in Android

How do I raise a Response Forbidden in django

Attributions