The problem is that the same changeset is there twice (commit with the same content). What the diff doesn't exactly show you why that is. If you want to see that, take a look at the DAG using a tool like gitk or gitg or what have you. You'll see that each of them is on a different branch and when you merged them, one of them became a no-op.
There are two possible approches how to fix it (result is the same), cherry-pick or rebase: git checkout master git pull upstream master git checkout -b ds3282-new git cherry-pick a7ffd60 git push terrywbrady ds3282-new:ds3282 --force or git checkout --track terrywbrady/ds3282 git rebase -i master pick a7ffd60 Fix js error for filters with dashes drop ecf6f42 Fix js error for filters with dashes git push terrywbrady ds3282-new:ds3282 --force Regards, ~~helix84 Compulsory reading: DSpace Mailing List Etiquette https://wiki.duraspace.org/display/DSPACE/Mailing+List+Etiquette -- You received this message because you are subscribed to the Google Groups "DSpace Technical Support" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/dspace-tech. For more options, visit https://groups.google.com/d/optout.
