Git squashing and duplicate commits
Hi guys, I'm a bit confused on how a proper workflow should look for squashing. I have the following issue:
1. I'll go and make commits on a feature / fix branch and squash & merge onto the main branch
2. I'll pull my changes from main into my local feature / fix branch to keep it up to date
3. I'll make some more commits on the local feature / fix branch and then do the same steps in 1 & 2
This duplicates the commits since the commits in my local are not squashed. What should I be doing to keep it in sync with main and not duplicate commits?
1. I'll go and make commits on a feature / fix branch and squash & merge onto the main branch
2. I'll pull my changes from main into my local feature / fix branch to keep it up to date
3. I'll make some more commits on the local feature / fix branch and then do the same steps in 1 & 2
This duplicates the commits since the commits in my local are not squashed. What should I be doing to keep it in sync with main and not duplicate commits?
A friendly place for developers to meet other devs, ask questions, get help, and just have a good time 🙂.
36,263Members
Resources
Recent Announcements
Similar Threads
Was this page helpful?
