Git分支和合并：来自2个分支的修改没有冲突？

Question

I'm puzzled by the git behaviour and i would like to have some explanations. Let me explain, i have 2 branches :

• master
• my_feature_branch.

---

The workflow :

• day 0 : i create my_feature_branch from master
• day +1 : from my_feature_branch : i do a change in the file "feature.java"
• day + 2 : from master i do a change in the file "feature.java"
• day + 3 : from my_feature_branch i merge master into my_feature_branch

---

Result : No conflict. my_feature_branch do not retrieve the changes from master in "feature.java". Git considers that "feature.java" from my_feature_branch is all correct.

Consequences : The fix did in master is not reported in my_feature_branch.

Answer 1

in most cases, Git will figure out how to integrate new changes.

However, there's a handful of situations where you might have to step in and tell Git what to do. Most notably, this is when changing the same file. Even in this case, Git will most likely be able to figure it out on its own. But if two people changed the same lines in that same file, or if one person decided to delete it while the other person decided to modify it, Git simply cannot know what is correct. Git will then mark the file as having a conflict - which you'll have to solve before you can continue your work.