Git Remote branch Merge conflict
situation:
local branch A
remote branch A
master
In local eclipase,
1. [Git Perspective] --> right click branch A --> merge --> choose master.
2. propose the confilict
3. [Team Synchronizing Perspective] --> Mark as Merged --> commit and push
Done!