I am maintaining a repository with three main branches: master, develop and 2.0.0-develop, the latter being a development branch for a long-term future breaking release. My workflow is pretty much as follows:
- Main development happens on develop.
- Develop is merged into master when a release is ready.
- Master is merged into 2.0.0-develop, which generally causes a bunch of merge conflicts I have to resolve.
I generally manage to get a pretty graph showing where the merge happens such as this one (from top to bottom the branches are develop, master and 2.0.0-develop):
However lately the link between master and 2.0.0-develop doesn’t appear anymore, which makes it rather difficult to visually track where the merge happened.
Once master has been updated, I generally perform the following actions:
git checkout master
git checkout 2.0.0-develop
git merge --no-ff master
- Solve merge conficts,
git rmas needed
git commit -m "Merge branch 'master' into 2.0.0-develop"
Until very recently this used to be enough for a link between branches to appear in the network graph, but now it only shows the commit alone in the branch as if a fast-forward had been performed, which is not what I want.
How can I get the network graph on GitHub to display that link without having to resort to making a pull request directly through GitHub?
Thanks in advance for the answers.