Squashing or editing some commits before doing git-svn dcommit?

后端 未结 4 586
梦如初夏
梦如初夏 2021-02-09 06:49

I am working on a project in a subversion repository with a strict check-in policy which includes: Every commit to the trunk has to be reviewed by another developer and this mus

4条回答
  •  一生所求
    2021-02-09 06:52

    Yes, you can rewrite the commit messages. Yes, you can just squash them all in to a single commit. This probably depends on the review process and how much you're doing at once.

    "Manually" moving each change to the master branch wouldn't be especially different from rewriting your commit messages at some level, but many diverging branches and cherry-picks could come in handy.

    Overall, the answer is "it depends" and "Git is flexible enough to do just about whatever you need".

提交回复
热议问题