Re: com web/php: Fixed merge conflict.: build-setup.php docs.php downloads.php get-involved.php include/footer.inc include/header.inc index.php
releases/index.php styles/home.css styles/theme-base.css styles/theme-medium.css support.php

On Sun, Dec 15, 2013 at 6:49 PM, Hannes Magnusson < hannes.magnusson@gmail.com> wrote: > On Sun, Dec 15, 2013 at 5:36 PM, Levi Morrison <morrison.levi@gmail.com> > wrote: > > > >> This doesn't look like a conflict merge fix at all. > > > > > > Oh, I forget this list just pulls out the last message to display when > > merging a branch; there was a local branch of mine that I merged. There > was > > a 2-line conflict when I went to push because of some changes __dm > (Dejan) > > made just before pushing. > > > > > Mhh. I don't think this "list just pulls out the last message". > I suspect in the middle of the rebase you got confused between and > previous commit and when git stopped to let you fix a conflict before > committing the entire patch you thought it had committed the full > patch except the conflicted lines? Possible; rebase is a supposedly powerful tool but I don't really like it. The replay hangs on conflicts because it doesn't know that later patches fix them (or something). It's possible I misused this tool, although I did tell it to continue after fixing conflict. The windows.php.net link was completely removed. > Not that I am very much against removing the entire subdomain, but > that seems a littlebit out of scope here. My apologies; this was an accident and will be fixed soon. Thank you for catching this.