nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

How to merge a branch with a single commit for staging branch

msk134

Hi,

I have three branches dev, test, and master. Now I want to maintain a staging branch before going the changes live. I have so many previous commits in the test branch, now I want to merge the test branch with a staging branch with a single commit (ex: Version 1.0). Then I will merge the staging branch to master. Can anyone help me with this?

Thanks in advance.

Accepted answers

All comments

Ganesh Babu_l9dxny

Hi @msk134

First you create a newbranch from your existing test branch (this would be best because if anything happens we can have the original test branch with us)

1. git checkout -b <new-branch-name>

2. git merge --squash <test-branch-name>

3. git commit #without -m

An editor should be popup with all the commit logs, and files changed from test branch. You could actually delete everything, and write only one line of the commit message you want to show after merging into master.

4. git checkout <staging branch>

5. git merge <new-branch-name>

msk134

Hi @Ganesh Babu

when I do the second step it is showing

"git merge --squash new-branch
(nothing to squash)Already up to date."

Ganesh Babu_l9dxny

Hi @msk134

From which branch did you create a new branch?

Try creating a new branch from the master branch. (May be i have mentioned as test branch in the last answer sorry for that).

after that follow the step 2 and 3. I think that's enough.

msk134

I tried below steps

1. git checkout test

2. git pull origin test

(I have a bulk of commits in the test branch)

3. git checkout -b staging

4. git merge test

5. git push origin staging

6. git rebase -i --root

I squash all the commits and gave one proper commit message here then I saved the file

Now I checked the log, it is showing updated single commit only

7. git push origin staging -f

after this again when I changed in the "test branch" with a few commits I tried to merge the test branch with staging it showing history-related errors...

Then I tried

8. git merge --squash test --allow-unrelated-histories

Here I am getting conflict errors. Can you help me if I am doing wrong

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

cloud

bitbucket

bitbucket-cloud

atl-gruland