Date: Thu, 16 Apr 2015 21:43:46 +0300 From: Aleksey Cherepanov <aleksey.4erepanov@...il.com> To: john-dev@...ts.openwall.com Cc: Solar Designer <solar@...nwall.com>, Mathieu Laprise <mathlaprise@...il.com>, Shinnok <admin@...nnok.com> Subject: Re: Johnny repo Hi Shinnok, I moved that to john-dev. On Thu, Apr 16, 2015 at 06:09:42PM +0300, Shinnok wrote: > Hey Aleksey, > > As previously mentioned, I messed up my repo by doing git pulls from your repo outside of Github's pull request policy. How I define messed up is that all your commits ended up with different hashes in my repo. > > The choices are: > 1. Reinit my repo with your repo, thus rewrite my Github repo history. > 2. Kindly request Mathieu to rebase the translation feature branch on your repo and make a pull request to you. > > Aleksey, are you satisfied with the idea of maintaining main repo ownership and having to do all the merges and such? If so then I'll happily purge my repo and start doing pull requests for yours. I think I already said that I'll be doing that, but I'd like to make this crystal clear, now that we have a third contributor. As of you're going to be the main mentor (right?) during gsoc, I think it will be more convenient if you maintain the main repo. Also to have one set of hashes should be better. To consider who own the repo to rebase, we to estimate work in third party projects. At the moment, my repo is more likely to be used by others. So to reinit repo and to rebase may be useful. Though usefulness should not be very big, so I'd look at this as at an exercise in git-fu. I hope there will not be users that will be hit by changing the main repo because johnny never supported workflow with doing just `git pull` in your local repo. So you clean out your wrong commits, pull appropriately (do you need a pull request from me to accomplish that?), then Mathieu rebases his work on your repo and pull into your repo. Ok? Thanks! -- Regards, Aleksey Cherepanov
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.