git拉源开发vs git合并

我已经签出一个功能开始工作;但我想用上一次开发更新它。但是我犯了一个错误,我没有使用“git-rebase-develope”,而是使用了“git-pull-origin-develope”,我看到发生了一次合并。可以吗?我可以继续说,它类似于“git rebase”或“git merge develop”?

$git checkout feature/migration
Branch 'feature/migration' set up to track remote branch 'feature/migration' from 'origin'.
Switched to a new branch 'feature/migration'


$git pull origin develop
From https://github.com/xxx
 * branch              develop    -> FETCH_HEAD
Auto-merging web/package.json
Auto-merging package.json
Merge made by the 'recursive' strategy.
 api/src/entity/User.ts            |  8 ++++++ ... more

我做的

git reset --hard  619c69ae

重置前记录

$git lg1
*   18ee4066 - (2 minutes ago) Merge branch 'develop' of https://github.com/proj into feature/migration - Dave (HEAD -> feature/migration)
|\  
| *   619c69ae - (16 hours ago) Merge branch 'release/3.1.64' into develop - Dave (origin/develop, origin/HEAD, develop)
| |\  
* | | e8491f6e - (3 days ago) fix delete index - Dave (origin/feature/migration)

*   619c69ae - (16 hours ago) Merge branch 'release/3.1.64' into develop - Dave (HEAD -> develop, origin/develop, origin/HEAD, feature/migration)
|\  
| | *   eaa8f62a - (16 hours ago) Merge branch 'release/3.1.64' - Dave (tag: 3.1.64, origin/master, master)
| | |\  
| | |/  
| |/|   
| * | 2dda35ad - (16 hours ago) release 3.1.64 - Dave
|/ /