re: Git TIP - Why you should not keep a local master branch ? VIEW POST

TOP OF THREAD FULL DISCUSSION
re: Having master on my local helps me to fix merge conflict which requires manual intervention.

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

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

Git branch foo

code of conduct - report abuse