I am following the git-flow workflow model for the version controlling. While I was working in a feature branch, someone else merged another feature branch to develop branch which contains some tree changes of the project. Now the project structure in my feature branch is different from the structure of the develop branch (eg: In my feature branch I am working in a file located in,
"com.translators.components"
. But in the develop branch the file is located in,
"modules.com.translators.components"
). When I took a pull from the develop branch, git showed very big number of conflicts since many file locations have been changed. I caot use "git pull --rebase" since I have a set of important local commits('rebase' merge all of these commits into a single commit).