Hooks prevents "merge upstream/master"

joachim
Mon, 24 Aug 2020 09:11:48 +0000
Development

In Github, I have my own fork of GitHub - Slicer/Slicer: Multi-platform, free open source software for visualization and image computing.. Now I want my fork to be synced, i.e. git fetch upstream and git merge upstream/master. But merging fails because of the standard commit message Merge remote-tracking branch ‘upstream/master’. ./Utilities/SetupForDevelopment.sh created a git hook to verify that my commit messages are upstream/master-friendly.

Am I doing things wrong? Should I use ENH: Merge remote-tracking branch ‘upstream/master’ in for my local repository? I haven’t collaborated much on Github, so I’m unsure how the workflow should be if I want to contribute.

6 posts - 3 participants