sugarlabs / convert

Sugar units conversion activity
GNU General Public License v3.0
0 stars 6 forks source link

[Fix] Result widget shows superfluous text cursor when clicked #17

Closed chimosky closed 6 years ago

quozl commented 6 years ago

Thanks. Reviewed.

Method;

Unfortunately, your patch blocks selecting and copying the result text.

I don't know why all the previous commits are still showing here even after being merged.

A combination of practices and events led to that;

Consequence is that you have a different view of history in your repository than in this repository.

You can fix it like this;

git checkout master
git pull --rebase sugarlabs master
git push --force

Assuming that origin is the git remote name for your repository, and sugarlabs is the git remote name for this repository.

For your confidence, I have tested this with your GitHub repository; the result looks like this;

host:~$ cd /tmp
host:/tmp$ git clone https://github.com/chimosky/convert.git
Cloning into 'convert'...
remote: Counting objects: 515, done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 515 (delta 10), reused 11 (delta 5), pack-reused 496
Receiving objects: 100% (515/515), 121.47 KiB | 127.00 KiB/s, done.
Resolving deltas: 100% (320/320), done.
Checking connectivity... done.
host:/tmp$ cd convert
host:/tmp/convert$ git remote add sugarlabs https://github.com/sugarlabs/convert.git
host:/tmp/convert$ git pull --rebase sugarlabs master
From https://github.com/sugarlabs/convert
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: [Fix] Result widget shows superfluous text when cursor clicked
host:/tmp/convert$ 

Looking at the log for this clone shows the history has been normalised; the duplicate commits reduced, and the new commit placed at the end.