git - How to add old zipped sources at the beggining of origin trunk? -

-

when started simple project didn't use repository store changes. created backups simple zip files. have many of them this:

  • backup_1_added_feature_a.zip
  • backup_2_added_feature_b.zip
  • ...
  • backup_n_added_feature_z.zip

at point switched git. first commit made last zip sources, , have new commits done:

origin/master: (c1)<-(c2)<-(c3) ...

( c1 == backup_n_added_feature_z.zip )

now add backup zip's in main trunk this:

origin/master: (zip1)<-(zip2)<-(zip3) ... (zipn)<-(c1)<-(c2)<-(c3) ...

is possible in git?

there's manual way it.

git checkout --orphan newroot git rm -rf . # unzip zip1 project directory git add . git commit  -m 'zip1' # unzip zip2 project directory git add . git commit  -m 'zip2' ... git rebase --onto newroot --root master git branch -d newroot

you can replace manual unpacking/adding/commiting of zip folder bash loop, obviously.

see https://stackoverflow.com/a/647451/2578489 explanation.


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