Our BitBucket repository was originally setup to use "Merge Commit" merge strategy. Six months back someone has changed the repository to use "Rebase and fast-forward" which we were unaware of.
In the last month, work has started up again on the repository where we have been working from the Develop Branch using Feature branches and merging them back into Develop "Merge Commit" style. Over that time there has been a longer running Feature branch taken from Develop that has performed a regular 'merge from Develop" into it to keep it up to date.
We just tried to Merge the long running Feature branch back into Develop via a BitBucket PR and it found conflicts. Merging locally worked without conflict because we were merging but BitBucket is rebasing. If we Rebase locally the conflicts appear but the code base is mangled beyond recognition.
Is it safe to simply switch the BitBucket Merge Strategy back to "Merge Commit" instead of "Rebase and fast-forward"?
Does the Merge Strategy have any bearing on the branching?
