@leoleoasd , did you talk about it?

The problem is that, this PR repeats two commits from master branch.

the "red commits" are commits of master branch, and, as you can see, your branch repeats these two commits.

Also, the "rebase" command changes the "base commit" of your branch. as you can see, your branch starts from "38a7ed4", which is not the latest commit of master, so there will be conflicts.

In my opinion, what you should do is :

# on bugfix/time-equals-2 branch
git reset f41f6c2

# remote origin should be your fork
# we need to add a new origin
# skip if you already done
git remote add upstream https://github.com/stretchr/testify.git
git fetch upstream # fetch the upstream changes
git rebase upstream/master # rebase your current branch (bugfix/time-equals-2)
git push -f

This will undo your "repeated" commits, rebase your branch from the latest master, and force-push. After doing these, your git log should be like this:

No bifurcations anymore and your commits are "based on" the lastest upstream master.

@leoleoasd check please last update

LGTM, but I don't have write access to this repo, we need to wait for a reviewer with write access 😂

I know)

@boyan-soubachov could you please review this?

@leoleoasd merged)) Thank you

It looks like this was reverted in ed4976c?

It looks like this was reverted in ed4976c?

Yes, check #985 for more details.
If you can't wait for v2, you can use my fork.