Merge the changes from one Git branch (One File) to another locally

Asked Apr 18 '18 at 07:09

Active Apr 18 '18 at 08:18

Viewed 124 times

I am new to Git, Currently I have two local Git branches with the same files (lets say BranchA and BranchB). I did one check-in/commit in BranchA (file xyz.c) long back.

Now i am working on BranchB and want to merge those check-in changes from BranchA to BranchB (merging two local branch file) without being change anything in Master branch.

Can someone help me out?

edited Apr 18 '18 at 08:18

Jens Gustedt

76,821
6
102
177

asked Apr 18 '18 at 07:09

embbeded

https://stackoverflow.com/questions/38206196/merge-one-local-branch-into-another-local-branch – wookiekim Apr 18 '18 at 07:12
@wookiekim Looks applicable, did you flag as duplicate? – Yunnosch Apr 18 '18 at 07:14
oops, no. Thanks! – wookiekim Apr 18 '18 at 07:16
First of all, the working tree is clean. Then, git marge BranchA – ChildrenGreens Apr 18 '18 at 09:32

Merge the changes from one Git branch (One File) to another locally

0 Answers0