Idea git considerations

1, when using idea for different branch switching, it is important to first the code current branch of the code submitted (can not push), or the current branch uncommitted code is considered to be switching the code, during the switchover process will create a conflict.

2, when using idea to merge, the backbone never manual editing, his code is always from the branch merge. If you manually edit the code, it may cause the merge to fail (the phenomenon is that there is no merge code).

Idea git considerations