How to avoid merge commits from Git pull when pushing to remote

前端 未结 4 1149
抹茶落季
抹茶落季 2021-01-30 13:06

I have a repository and some local changes to commit. Before committing, I pulled the changes onto my local using Egit in Eclipse.

It creates a merge commit and I submit

4条回答
  •  醉酒成梦
    2021-01-30 13:46

    The usual strategy is to work on a branch. When the remote master changes, pull the changes to master and instead of merging, rebase the branch.

    See Git Rebase at Atlassian.

提交回复
热议问题