I have 2 branches on my Git project:
- develop
- myfeature
I tried to merge develop into my feature without having a merge commit.
Any ideas on how to do this?
I tried to git merge and then push force. Iam not sure that it is the right way to do it.
>Solution :
you can find a valid answer here :
https://stackoverflow.com/a/5308983/4078430
The key is to squash either with rebase or merge