I recently committed changes to persona-toolkit with bad results: https://github.com/macports/macports-ports/commit/b389457e1c3d521d540b00b5e765a73b8f59089c
Notice the “+<<<<<<< Updated upstream” and “+>>>>>>> Stashed changes” lines. The tried a “pull —rebase” and git complained about local changes so I stashed the changes and tried again. These are the commands I executed in order: git add Portfile git ci git pull —rebase git stash git pull —rebase git push Anyone know what I did wrong? Regards, Bradley Giesbrecht (pixilla)
