Follow

Keep Up to Date with the Most Important News

By pressing the Subscribe button, you confirm that you have read and are agreeing to our Privacy Policy and Terms of Use
Contact

How to merge and squash at the same time

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?

MEDevel.com: Open-source for Healthcare and Education

Collecting and validating open-source software for healthcare, education, enterprise, development, medical imaging, medical records, and digital pathology.

Visit Medevel

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

Add a comment

Leave a Reply

Keep Up to Date with the Most Important News

By pressing the Subscribe button, you confirm that you have read and are agreeing to our Privacy Policy and Terms of Use

Discover more from Dev solutions

Subscribe now to keep reading and get access to the full archive.

Continue reading