How do I force a git merge

Question

I have two branches, master and a local branch. I want to merge changes made from master to my local branch. I know the changes in master are more recent than the ones in my local branch, but when I go to the local branch and write git merge master, the response is Already up-to-date. I may have tricked my local branch into believing it is more current than master, I'm not sure how.

How can I force a merge conflict? Most of the files in master are more recent than the ones in local?

If you don't checkout master locally, pull it, then checkout your branch and merge. If you have some how managed to fool git, then that was 'erm foolish. :( — Tony Hopkinson, Feb 02 '14 at 18:43

hek2mgl · Answer 1 · 2014-02-02T18:51:26.247

1

Fetch the remote changes before merge:

git checkout local_branch
git fetch origin
git merge origin/master

I assume that you've used origin as the name for the remote.

edited Feb 02 '14 at 18:51

answered Feb 02 '14 at 18:45

hek2mgl

143,113
25
227
253

score 0 · Answer 2 · answered Feb 02 '14 at 19:05

0

I m considering that you have the latest code in your master and it is in your workstation

 git checkout local;
 git merge -s ours master;

answered Feb 02 '14 at 19:05

Girish

1,677
1
17
29

score 0 · Answer 3 · edited May 23 '17 at 12:11

0

Maybe you want rebase instead of merge?

Checkout local branch. Then:

git rebase master

Rebase is usually what you want when you're thinking about merge.

Git workflow and rebase vs merge questions

edited May 23 '17 at 12:11

Community

1
1

answered Feb 02 '14 at 22:59

joel3000

1,139
10
19

How do I force a git merge

3 Answers3