merge conflicts 2.3 <== master

Added by Zdravko Balorda about 5 years ago

merging master branch into 2.3-stable produces a lots of conflicts.
Am I doing something wrong?

git checkout -f 2.3-stable
git pull origin master
Automatic merge failed; fix conflicts and then commit the result.

And yes, there are many conflicts, indeed.
I have a branch based on 2.3-stable which I would like to upgrade sometime...
Any clues are welcome.

Regards, Zdravko

Replies (1)

RE: merge conflicts 2.3 <== master - Added by Etienne Massip about 5 years ago

Redmine code is hosted by SVN in the first place.

Dis you try to merge your 2.3 extended branch into master instead?