Actually you can't have the .Travis.yml file in a separate branch, Travis
require it present in the context that it is testing (commits to all
branches)

On Thursday, May 8, 2014 7:53:52 PM, Felipe Contreras <
felipe.contreras at gmail.com> wrote:

> W. Trevor King wrote:
> > On Thu, May 08, 2014 at 11:18:23PM +0000, Wael Nasreddine wrote:
> > > Well like I said in my first email, if you guys are interested in
> owning
> > > and maintaining the GitHub repo it is yours, besides I have not done
> > > anything with the history I only added one commit which will never
> conflict
> > > with upstream unless you add a .Travis.yml file :)
> >
> > I don't think merge conflicts are the problem here.  If the GitHub
> > mirror claims to be a mirror but adds an additional commit B:
> >
> >   -o---o---o---A  notmuch/master
> >                 \
> >                  B  github/master
> >
> > Someone who takes the ?mirror? claim at face value may use
> > github/master as the base for some feature:
> >
> >   -o---o---o---A  notmuch/master
> >                 \
> >                  B  github/master
> >                   \
> >                    C---o---o  some-feature
>
> That wouldn't be a problem if HEAD didn't point to 'master' but to
> 'upstream' which would be 'notmuch/master'.
>
> Or if the branch with the modifications was called something else, like
> 'travis-ci'.
>
> --
> Felipe Contreras
-------------- next part --------------
An HTML attachment was scrubbed...
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20140509/a6838aa3/attachment.html>

Reply via email to