From 5791e45d81489504cecbbb496c5af76515fc77f0 Mon Sep 17 00:00:00 2001
From: Santiago Perez De Rosso <sperezde@csail.mit.edu>
Date: Thu, 10 Sep 2015 16:46:16 -0400
Subject: [PATCH 1/3] fixed bug that caused merge not to apply uncommitted
 saved changes

---
 gitless/cli/gl_commit.py  |  4 ++--
 gitless/core.py           |  2 +-
 gitless/tests/test_e2e.py | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/gitless/cli/gl_commit.py b/gitless/cli/gl_commit.py
index 9ce34fb..1bea01b 100644
--- a/gitless/cli/gl_commit.py
+++ b/gitless/cli/gl_commit.py
@@ -68,7 +68,7 @@ def _op_continue(op, fn):
   pprint.blank()
   try:
     op(op_cb=pprint.OP_CB)
-    pprint.ok('{0} succeeded'.format(op))
+    pprint.ok('{0} succeeded'.format(fn))
   except core.ApplyFailedError as e:
-    pprint.ok('{0} succeeded'.format(op))
+    pprint.ok('{0} succeeded'.format(fn))
     raise e
diff --git a/gitless/core.py b/gitless/core.py
index 910f59c..f1fd97f 100644
--- a/gitless/core.py
+++ b/gitless/core.py
@@ -792,7 +792,7 @@ def merge(self, src, op_cb=None):
         raise GlError(stdout(e) + err)
       if op_cb and op_cb.save:
         op_cb.save()
-      git.stash.save('--', _stash_msg_merge)
+      git.stash.save('--', _stash_msg_merge(self))
       try:
         git.merge(src, '--no-ff')
       except ErrorReturnCode as e:
diff --git a/gitless/tests/test_e2e.py b/gitless/tests/test_e2e.py
index cfd9e55..9b59a44 100755
--- a/gitless/tests/test_e2e.py
+++ b/gitless/tests/test_e2e.py
@@ -604,6 +604,26 @@ def test_uncommitted_changes(self):
     self.assertEqual('uncommitted', utils.read_file(self.MASTER_FILE))
     self.assertEqual('uncommitted', utils.read_file('master_untracked'))
 
+  def test_uncommitted_tracked_changes_that_conflict(self):
+    gl.branch(c='tmp', divergent_point='HEAD~1')
+    gl.switch('tmp')
+    utils.write_file(self.MASTER_FILE, contents='uncommitted')
+    self.assertRaisesRegexp(
+        ErrorReturnCode, 'failed to apply', gl.merge, 'master')
+    contents = utils.read_file(self.MASTER_FILE)
+    self.assertTrue('uncommitted' in contents)
+    self.assertTrue('contents 2' in contents)
+
+  def test_uncommitted_tracked_changes_that_conflict_append(self):
+    gl.branch(c='tmp', divergent_point='HEAD~1')
+    gl.switch('tmp')
+    utils.append_to_file(self.MASTER_FILE, contents='uncommitted')
+    self.assertRaisesRegexp(
+        ErrorReturnCode, 'failed to apply', gl.merge, 'master')
+    contents = utils.read_file(self.MASTER_FILE)
+    self.assertTrue('uncommitted' in contents)
+    self.assertTrue('contents 2' in contents)
+
 
 class TestPerformance(TestEndToEnd):
 

From a26488aad02a4da6ae222daf434561fed754a6b7 Mon Sep 17 00:00:00 2001
From: Santiago Perez De Rosso <sperezde@csail.mit.edu>
Date: Thu, 10 Sep 2015 16:57:06 -0400
Subject: [PATCH 2/3] fix printing of remote branches

---
 gitless/cli/gl_branch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitless/cli/gl_branch.py b/gitless/cli/gl_branch.py
index 155fa70..dabe71e 100644
--- a/gitless/cli/gl_branch.py
+++ b/gitless/cli/gl_branch.py
@@ -98,7 +98,7 @@ def _do_list(repo, list_remote, v=False):
   if list_remote:
     for r in repo.remotes:
       for b in (r.lookup_branch(n) for n in r.listall_branches()):
-        pprint.item('  {0}'.format(colored.yellow(b.branch_name)))
+        pprint.item('  {0}'.format(colored.yellow(str(b))))
         if v:
           pprint.item('    ➜ head is {0}'.format(_ci_str(b.head)))
 

From bd84bd378727c78acd2bae4f0c84b1123f47cdf2 Mon Sep 17 00:00:00 2001
From: Santiago Perez De Rosso <sperezde@csail.mit.edu>
Date: Thu, 10 Sep 2015 17:10:05 -0400
Subject: [PATCH 3/3] prep for v0.8.2

---
 gitless/cli/gl.py | 2 +-
 setup.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitless/cli/gl.py b/gitless/cli/gl.py
index 823c789..c3d7818 100644
--- a/gitless/cli/gl.py
+++ b/gitless/cli/gl.py
@@ -29,7 +29,7 @@
 INTERNAL_ERROR = 3
 NOT_IN_GL_REPO = 4
 
-VERSION = '0.8.1'
+VERSION = '0.8.2'
 URL = 'http://gitless.com'
 
 
diff --git a/setup.py b/setup.py
index 2526656..c2592e1 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-VERSION = '0.8.1'
+VERSION = '0.8.2'
 
 
 # Build helper