赞
踩
on github, there are 3 options when branches are merged. the difference is here What's the Difference Between the 3 Github Merge Methods?
some good practices: (image the branch structure is feature->development->master->release)
Rebase and merge
is not an option for most organizations. This command normally requires the permission of push -f
, which can be a source of troubleCreate a merge commit
. Otherwise, the next merge will require you to sync between development and masterCreate a merge commit
and Squash and merge
can be used
Create a merge commit
Squash and merge
Copyright © 2003-2013 www.wpsshop.cn 版权所有,并保留所有权利。