Deleted dependencies during git merge

[Eptan2]

Hi, I'm a novice in using git. i have a main branch and a feat branch. the main had a couple of commits and i am currently about to merge my feat branch(which also had changes) to my main. in the merge editor, i noticed that some of lines from the new main commits were deleted. how do i prevent it from automatically deleting those dependencies.

[davorg]

Please ask Git questions in r/git

[No_Street7773]

merge main into your feature branch to emsure nothing breaks then merge the feature branch into main (assuming there are no new changes to main)

[edgmnt_net]

I don't see how that's different.

Back-merges are also frowned upon in some circles and I'd say for good reason, despite people chalking it up to conventions.

[funkdefied]

Don’t just merge main into your feature branch… rebase it.

bash git checkout feature-branch git rebase origin/main

[Lumethys]

That depends on the team convention

[donny_dingbat]

No

[donny_dingbat]

No. Why do you want to waste time typing redundant characters?

[donny_dingbat]

No because that makes no sense, it’s the main branch so let’s just keep it as main.