title: In git, how can I get a file from the server, after I merged two branches on production, into my local branch?
body: <p>I did a merge of branch A and branch B on the production server(Branch B was merged into branch A). Now there are files that are in branch A that came from branch B as expected. Unfortunately, locally when in Branch A, those files that came from branch B are missing. However, they are in Branch A on the server. How can I pull those files?</p>