Merge test branch with master branch in Git

0 votes

Hi Team,

I have two branches namely master and test in a Git Repository. I am doing all my tests in the test branch. Now I want to merge all the changes in the master branch. How to do that?

Jan 4 in Git & GitHub by akhtar
• 38,210 points
217 views

1 answer to this question.

0 votes

Hi@akhtar,

You can merge master into the test first so that if there are any conflicts, you can resolve them in the test branch itself and the master remains clean.

(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won't be any conflicts now)
answered Jan 4 by MD
• 95,300 points

Related Questions In Git & GitHub

0 votes
1 answer

How to do a re-merge into another branch in git

Seems like you want to rebase your ...READ MORE

answered May 7, 2018 in Git & GitHub by DareDev
• 6,890 points
1,051 views
–1 vote
1 answer

Having problem in Github and remote Git repo with production and development code

I think you could start with this. The ...READ MORE

answered Apr 10, 2018 in Git & GitHub by shubham
• 7,320 points
300 views
0 votes
1 answer

How merge works in Git & GitHub!!!??

Hi@Hasid, In Git & GitHub merge concept comes ...READ MORE

answered Jan 31, 2020 in Git & GitHub by MD
• 95,300 points
144 views
0 votes
1 answer

How to create branch in GitHub from my local Git repo?

Hi@akhtar, To sync your existing branch in GitHub, ...READ MORE

answered May 7, 2020 in Git & GitHub by MD
• 95,300 points
168 views
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
1,259 views
+2 votes
1 answer
0 votes
1 answer

How to merge with squash in Git?

Hi@akhtar, If you want to merge your data ...READ MORE

answered May 13, 2020 in Git & GitHub by MD
• 95,300 points
170 views
0 votes
1 answer

How to get changes from master branch to a new branch in Git?

Hi@akhtar, You need to check out the branch and ...READ MORE

answered Jan 4 in Git & GitHub by MD
• 95,300 points
172 views