Skip to content

Add Riot 0.6.3

username-removed-851501 requested to merge oddvar/old_fdroiddata:riot603 into master

Hi again,

thanks for tips in the last merge request, however when I run git pull --rebase upstream master I get:

From https://gitlab.com/fdroid/fdroiddata
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Add Riot 0.6.0!
Using index info to reconstruct a base tree...
M	metadata/im.vector.alpha.txt
.git/rebase-apply/patch:38: new blank line at EOF.
+
warning: 1 line adds whitespace errors.

For whatever reason the "Add Riot 0.6.0!" commit still appears as a "new" commit.

Again, if you look at the diff it's obvious what's changed, so why does it still list all 12 commits?

Merge request reports