DEV Community

Discussion on: Git TIP - Why you should not keep a local master branch ?

Collapse
 
firozansari profile image
Firoz Ansari

Having master on my local helps me to fix merge conflict which requires manual intervention.

Thread Thread
 
dietertroy profile image
Troy

How would you resolve a merge conflict using origin/master? Seems scary to me. I've always done it manually like @firoz states.

Thread Thread
 
jessekphillips profile image
Jesse Phillips • Edited

Committing to a detached head is risky because if you change branches you'll need to use reflog to retrieve it. However a branch name can be added at any time

Git branch foo