github - How exactly (with a diagram) does Git Fetch + Merge work? -


i'm attempting merge git repositories subfolders under 1 large repository. working fine, , doing:

git remote add -f <name> <url> git merge <name>/master

however, after doing steps above, accidentally removed new files came remote. git-committed. wanted "add" them again, did git merge /master, nothing appeared, , console output, "already up-to-date". in mind, remote name/master, points github directory aka files want add; since local master branch pointing bunch of files missing remote files, can merge them , wah-lah. apparently i'm misunderstanding here..

i'm newbie this, think it'd super helpful have diagram pointers , such describing above steps do, , went wrong when deleted files?

appreciate insight!

your mistake wasn't removed new files (it can happen anyone), error new commit. when did that, local branch moved forward work, remote branches 1 commit behind. that's why new git merge didn't work (all repositories merged).

maybe, have undone last commit:

$ git commit ...(removed files) $ git reset --soft head~1 (undo last commit)

see similar example:

enter image description here


Comments

Post a Comment

Popular posts from this blog

c# - Validate object ID from GET to POST -

i have method allows user access comment have made on site. have post method lets them update comment. my normal solution send entire comment model through, let them update it, update on database when post back. involve sending commentid through in hiddenfor , can manipulated. how can verify commentid sent in get method same i'm getting in post , not able alter comment wish? how can verify commentid sent in method same i'm getting in post? basically have validate following things in post - user logged-in user. authenticated users post comments. commentid in post , should valid commentid , should present in database. userid associated logged-in user should same userid associated comment . comment should contain userid column, can check @ time of update. to make sure update happens comment has been sent in get - hold commentid in session , in post action compare commentid value in session .
Read more

node.js - Custom Model Validator SailsJS -

when using custom model validator checks record within model. return within spread doesn't seem end control flow. //post.js model /** * custom validator **/ types: { isuservalid: function(user_id) { var promise = require('bluebird'); promise.all([ user.findone({id: user_id}) ]) .spread(function(user) { console.log(user); if (user === null || user === undefined) { console.log('failed'); return false; }else{ console.log('passed'); return true; } }); } }, my response standard validation failed response. { "error": "e_validation", "status": 400, "summary": "1 attribute invalid", "model": "post", "invalidattributes": { "owner": [ { "rule": "isuservalid", ...
Read more

php - Find a regex to take part of Email -

i have following emails need extract part from: bestellnummer xxx: 1 von xxx, 1er pack ------------- anfang der nachricht ------------- foo bar baz foo bar baz // <<<<< need text here ------------- ende der nachricht ------------- ------------- anfang der nachricht ------------- foo bar baz foo bar baz ------------- ende der nachricht ------------- there 0 unlimited occurences of ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- and i'm able extract first part regex: $re = "/------------- .*? -------------.?(.*?).?------------- .*? -------------/s"; but, i'm quite new on learning regex, i'm pretty sure there must better regex extract part (foo bar baz foo bar baz) of text between ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- as can in different languages, i'm using .? to match between hyphens. i...
Read more