git , how to accept rm file update without delete the file? -


i have local_settings.py in django prject, custom settings different each dev. yesterday, mistake commit conf/local_settings.py repo , push bitbucket. project new, think can not rollback because file committed @ first push,
remove local_settings.py repo without delete git rm --cached ./conf/local_settings.py.that works on local machine.

i meet error when git pull on vps.

..... >>> git pull origin master updating f1d56d3..6163ffb error: local changes following files overwritten merge:         conf/local_settings.py please, commit changes or stash them before can merge. aborting

how can make others not delete local_settings.py after pulling repo , update code automatically? new git , afraid go wrong if others merge themself in case.

my case example:

a has local_settings.py , b has local_settings.py, use origin master.

  1. a git init , push files. b pull. a, b change local_settings.py , different.
  2. a find local_settings.py should not in repo.
  3. a git rm --cached ./conf/local_settings.py, , push commit.
  4. (what need) b pull, remove local_settings.py b local repo without delete it.

other developers won't able pull version contains local_settings.py because git knows overwrite (untracked) version. after remove , push removal, other developers able pull again.


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