git pull source tree

Question

I need to pull master into recette branch. When I try (select recette branch click on pull select master on distant branch) the source tree tells me I'm already up to date but I'm not.

But when I right click on diff current there is a lot of diff.

I don't understand this issue someone can help me please?

before pull

result

Diff shows changes that you've made locally, even when you're up-to-date with origin. — evolutionxbox, Dec 13 '17 at 16:59

score 0 · Answer 1 · answered Dec 13 '17 at 17:16

0

Read about git pull. The last paragraph on the DESCRIPTION section explains (the emphasis is mine):

If any of the remote changes overlap with local uncommitted changes, the merge will be automatically canceled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with git-stash.

answered Dec 13 '17 at 17:16

axiac

68,258
9
99
134

thanks i understand, And there is a solution ? Maybe merge request on git web ? – jean moreau Dec 14 '17 at 09:45

git pull source tree

1 Answers1