[pull 5236] seeking advise

[Bjarne D Mathiesen]

https://github.com/macports/macports-ports/pull/5236

This is the 1st time I've tried this, so please be nice to a newbie ;-)

I've used git before; but not github, so the interaction between my own
git instance & what's happening on github is something I'm learning
along the way.

1) Am I correct in assuming, that if I have to edit my submission, I'll
have to do it this way :
    git checout dovecot2
    git reset --mixed HEAD~1
    <make my edits>
    git commit -a <edit comment>
    git push --force origin

2) My pull has a conflict; but I can't see what's wrong here ?!? The two
files github claims are in conflict has nothing to do with each other.
Please advise me here in how I can resolve this conflict.

3) dovecot has a maintainer & macportsbot has assigned the pull to ¿him?
because I've suggested obsoleting dovecot; but I've heard nothing from
the maintainer so far. Can somebody else eg take over ?!?

thanks :-)
-- 
Bjarne D Mathiesen
Korsør ; Danmark ; Europa
----------------------------------------------------------------------
denne besked er skrevet i et (næsten) M$-frit miljø
MacOS X 10.13.6 High Sierra :
   17" 2011 MacBook Pro ; 2.8GHz Intel Core i7 ; 16GB 1067MHz DDR3
   2012 Mac Pro ; 2 x 3.46GHz 6-Core Xeon ; 48GB
MacOS X 10.6.8 Snow Leopard :
   Mac Mini ; 2GHz Core 2 Duo (64 bit) ; 4GB (3GB actual) 667MHz
   Mac Mini ; 1.83GHz Core Duo (32 bit) ; 2GB 667Mhz