Override merge without loosing commits in Git

Asked Mar 30 '21 at 13:18

Active Mar 30 '21 at 16:48

Viewed 31 times

In my master branch There are old commits which are important for me to not loose

I have another branch named beta-release and it lost those old commits since I had to reset its head and then had to add all the changes and make a commit , resulting into a single commit of the whole branch which is the updated version of the whole app !

Now if I merge beta-release (into master) instead of deleting those files that are not present in the beta-release branch , it keeps them , basically just merging but I want to override without loosing commits of the master branch but making the single commit of the beta-release branch as the newer commit that replaces everything in master

Here's my master branch containing old commits which do not reflect the updated version of the app]1

I want to override master with beta release branch with history of old commits in master branch

edited Mar 30 '21 at 16:48

knittl

216,605
51
293
340

asked Mar 30 '21 at 13:18

Waqas Tahir

5,729
4
20
41

1

I'm struggling to follow your description here. Can you give a visual representation of the current and desired commit graph? – IMSoP Mar 30 '21 at 13:20
Would rebase help? if you were to rebase `beta-release` on to `master`? – Praveen Premaratne Mar 30 '21 at 13:26
You say: "There are old commits which are important for me to not loose" in master. But then you say you want: "to override master with beta release branch without history of old commits in master branch". This is confusing. – astrochun Mar 30 '21 at 13:28
Rebasing does not override – Waqas Tahir Mar 30 '21 at 13:29
nooooo I want to keep the history in master branch but override changes ! its not even asking me about differences – Waqas Tahir Mar 30 '21 at 13:30
I want to do Reset head to the latest commit of the beta-release but that makes master loose all the commits – Waqas Tahir Mar 30 '21 at 13:31
I am using test branches to do this – Waqas Tahir Mar 30 '21 at 13:31
@WaqasTahir: you can use the `ours` merge strategy. See the linked duplicate. Does it answer your question? – knittl Mar 30 '21 at 14:29
I will try to do it – Waqas Tahir Mar 30 '21 at 14:34

Override merge without loosing commits in Git

0 Answers0