Setting Up a Public Git Repo -

-

my team has been working on platform past few months, , we're ready release rest of firm. we'd follow "integration manager workflow" found here: http://git-scm.com/book/en/distributed-git-distributed-workflows.

we have proprietary code in our team repository we'd rather not share rest of firm, , must create "stripped-down" version of our current team repository. i'm looking @ doing following:

  1. clone our existing team repository create "integration manager repo"

  2. rm proprietary files

  3. commit rms

  4. rebase -i --root squash commits , prevent rewinds

  5. clone --bare "integration manager repo" create "blessed repo"

now, being relatively inexperienced git, couple of things uncertain me approach:

  1. can still pull "blessed repo" our team repo?

  2. assuming can #1, think rms pulled, deleting of our proprietary files. need git view our team repo's more-advanced state child state of blessed repo state. can rebase?

  3. as continue work on platform, commit our team repo mixture of "public" features , proprietary features. best way push "public" features? can rebase change order of commits "public" feature commits @ front of commit history, , git push sha of latest "public" feature commit?

thanks in advance help... wanted run more experienced git users before making such big changes.

update sorry, wasn't being clear... steps 2, 3 , 4 meant applied "integration manager repo". in case, read more on rebase , decided wasn't idea rebase our team's shared repository every time made "public" change.

what ended doing instead of steps 2, 3 , 4 rm .git folder in "integration manager repo", , start on fresh git init. pulled fresh "integration manager repo" , merged our team's repo, using -s ours flag since our team's version superset. our team repo , public repo have common commit. created "public" branch in our team repo , pointed common commit. going forward, whenever make public change, need cherry-pick "public" branch , pull public branch "integration manager repo".

you won't able pull changes blessed repo team 1 (as they're rebased), may able cherry-pick them. of course, conflicts part of routine.

as you've squashed rms, blessed repo never see rms performed @ all. so, whenever cherry-pick commits team repo, have files never change (and troubles can generate).

the problem publishing changes team repo blessed 1 :)

if (well, time ago in similar position), think in creating kind of script moves changes 1 repository other. when going blessed 1 team one, make warning related rm'ed files want see based on files changed (if any). when going back, exclude changes rm'ed files.

anyway, don't think idea @ all. triple check before going wild - maybe start babysteps?

good luck :)


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