Quantcast

erroneous merge

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

erroneous merge

Takeshi Enomoto-3
Hi,

I am afraid that I committed merge by mistake.

[bfead471654d7b1bbbe44af86824e89835bfca0d/macports-ports]

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.

Regards,

Takeshi


---
Takeshi Enomoto
[hidden email]
_______________________________________________
macports-dev mailing list
[hidden email]
https://lists.macosforge.org/mailman/listinfo/macports-dev
Loading...