I've had to fix the TravisCI config. Do you mind rebasing the branch and then I can merge it?

Of course I do not mind

I can merge the master in my branch pulling up new changes

Thank you, there still seem to be some conflicts, do you mind having a look again?

Sorry, upstream has not been updated. The last commit pulled all the changes from testify

Thanks in advance for the opportunity to contribute))

Something is very weird, still getting errors due to conflicts:

Are you able to rebase and squash maybe? I promise I will merge it as soon as you do :)

Hi, very sorry, I was very busy. I merge the latest changes from master to my branch. Unfortunately, the commits could not be squashed, I'm afraid to do a hard push or rebase

Hi, very sorry, I was very busy. I merge the latest changes from master to my branch. Unfortunately, the commits could not be squashed, I'm afraid to do a hard push or rebase

If you rebase, resolve any conflicts and then force-push your branch you should be fine.

We can't merge this PR while there are conflicts :)

Please show me in which files the conflicts occur, I will solve them locally, because I still don't understand a little how and where I can rebase and force-push

should i rebase my branch to master?

should i rebase my branch to master?

Yes, you'd rebase on master, something along the lines of

git rebase master
<resolve conflicts with your editor>
git push -f fork

where fork is the remote set-up to your fork.

This is a good and thorough guide on the general flow: https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/

I did rebase and force-push, as you asked

It seems that the fork branch's commit is still messy. Maybe consider check out a new branch from master branch of stretchr's repo locally, re-do your changes on fork branch and force-push your new branch to origin/fork?

Should we close this given that #979 fixed the git history issue?