merge --ours without conflicts

6 years ago • updated 6 years ago • 1

When working with several active release we usually develop the feature in the oldest active release and the merge things upwards to newer versions.

For this usecase we need an option to ignore the whole merge in newer releases if it's not needed in here. Git provides this via `git merge --ours `

Vote

We implemented an accelerator for this issue that works well when changes are present.

In this case we used `git merge -s ours --no-commit` to add a custom commit message.

The Smartgit GUI prohibts committing the merge because no changes are present in the index.

The Git command line client is able to proceed the merge. This seems to be a bug in smartgit.

Please also see attached screenshots.