git - how to directly merge github pull request to my private repo? -

-

here's situation,

  1. i have private repo, privaterepo, on own server
  2. i make private repo on github public repo, openrepo (like mirror)
  3. people can fork openrepo, makes changes, sends pull request
  4. if request accepted, i'd rebase directly privaterepo instead of merging openrepo
  5. meanwhile, commits can submitted privaterepo people working directly on privaterepo

because if accept merging on openrepo, have update privaterepo openrepo, there circle , it's redundant, not conflicts resolving. possible?

what circle talking about? flow merging on openrepo , syncing privaterepo absolutely clear. have 2 remotes - private , public, merge pulls in public, , sync private. if you'd skip pull requests in openrepo, deviate more , more privaterepo. tricky job sync them again after while. also, if not keep public repo up-to-date, people can base work on old, stale commits. example create branch fix bug, while has been fixed pull request not merged. also, unclear why need public repo if not accept pull requests in it?

i understand may want hide parts of code hidden plebs. can have dozen of branches in privaterepo it, not being published openrepo!


Comments

Post a Comment

Popular posts from this blog

ios - UICollectionView Self Sizing Cells with Auto Layout -

-
Image
i'm trying self sizing uicollectionviewcells working auto layout, can't seem cells size content. i'm having trouble understanding how cell's size updated contents of what's inside cell's contentview. here's setup i've tried: custom uicollectionviewcell uitextview in contentview. scrolling uitextview disabled. the contentview's horizontal constraint is: "h:|[_textview(320)]", i.e. uitextview pinned left of cell explicit width of 320. the contentview's vertical constraint is: "v:|-0-[_textview]", i.e. uitextview pinned top of cell. the uitextview has height constraint set constant uitextview reports fit text. here's looks cell background set red, , uitextview background set blue: i put project i've been playing on github here . updated ios 9 after seeing github solution break under ios 9 got time investigate issue fully. have updated repo include several examples of different configurations s
Read more

node.js - ldapjs - write after end error -

-
i have created authentication service using following code in node.js , ldapjs. var when = require ('when'); var authenticationerror = require('../errors/authenticationerror'); var sessionmanagerservice = require('./sessionmanagerservice'); var ldap = require('ldapjs'); var client = ldap.createclient({ url: 'ldaps://ad.mycompany.com:636', tlsoptions: {'rejectunauthorized': false} }); module.exports = { signin: function (email, password) { return this.ldapbind(email, password).then( function () { return sessionmanagerservice.createsessionhash({email: email}); } ); }, ldapbind: function (email, password) { var deferred = when.defer(); client.bind(email, password, function(err) { if (err) { deferred.reject (new authenticationerror('invalid username and/or password!', 'authentication.signin.error')
Read more

DOM Manipulation in Wordpress (and elsewhere) using php -

-
DOM Manipulation in Wordpress (and elsewhere) using php - i'm quite new dom manipulation world , head start in order avoid mutual errors. i looking efficient way manipulate content generated wordpress using php. @ moment using simple html dom seems work fine. found domdocument , few others , helpfull if cleared out 1 faster, improve or @ to the lowest degree generate less errors in case of bad markup. also on side can explain syntax (instead of $html @$html) thank much php wordpress domdocument simple-html-dom
Read more