erroneous merge

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

erroneous merge

Takeshi Enomoto-3

I am afraid that I committed merge by mistake.


I tried to commit
[66fbff8516344910e3e1b5f1a90c32c398a06032/macports-ports] and the repo
seems to be have been updated so I did

git pull

I was asked to write comments, but I quit the editor then I did

git pull --rebase

For the reasons I don't understand, merge has been recorded.

Sorry for the mess. I hope someone can fix this.



Takeshi Enomoto
[hidden email]
macports-dev mailing list
[hidden email]