Have you force pushed your master?

redguardtoo / emacs.d

Fast and robust Emacs setup.

http://blog.binchen.org

GNU General Public License v3.0

2.41k stars 616 forks source link

Closed phye closed 2 years ago

phye commented 2 years ago

I remembered I've resolved conflicts couple of weeks ago, but when I try to merge your master again, similar conflicts reappreared...

redguardtoo commented 2 years ago

Yes, I do force push sometimes, So don't merge too frequently.

phye commented 2 years ago

Got you.