Always have to resolve merge conflicts when merging into main

[chadstewart]

Whenever I try to create a PR into main, I always have to resolve merge conflicts which is just accepting current.

Need to find out why that is so I can have more frictionless releases.

[stradox4u]

• Looking at your git history, it seems like your merging process might be to blame, as you'll see that your main branch is far from, and has a different history from your dev branch.
• At my job, we merge our features into dev, and then dev into main. We make sure that main and dev share a common commit history, so there are no merge conflicts when merging dev into main.

[chadstewart]

Yeah, I need to look at how I'm merging. So the idea I had was that I'd make a new branch for whatever work I was working on and then create a PR and squash and merge the PR into dev. Once I was comfortable with all the things in dev, I'd squash and merge dev into main. The thing is, that's been making things messy it seems so I clearly need to look back ati what I'm doing.

So clearly the process I'm doing isn't the best but does it even sound like it makes sense at all?

[stradox4u]

Yeah, I think you should only squash when merging a feature into dev. From dev to main, there should be no squashing, so their commit histories stay identical.

…

On Wed, 2 Nov 2022, 2:35 pm Chad Rhonan Stewart, ***@***.***> wrote: Yeah, I need to look at how I'm merging. So the idea I had was that I'd make a new branch for whatever work I was working on and then create a PR and squash and merge the PR into dev. Once I was comfortable with all the things in dev, I'd squash and merge dev into main. The thing is, that's been making things messy it seems so I clearly need to look back ati what I'm doing. So clearly the process I'm doing isn't the best but does it even sound like it makes sense at all? — Reply to this email directly, view it on GitHub <#16 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AKE53S677ZYP6AAYBIQPMZTWGJU3LANCNFSM6AAAAAARR2P6EI> . You are receiving this because you commented.Message ID: ***@***.***>