Visual Studio Git - Cannot ignore committed file and switch branches -


i'm working in visual studios tfs , have 3 branches. in our repo each branch has 2 solutions configs files. config files have been committed , need remain committed. however, on machine need change config files point correct db.

i've tried git update-index --skip-worktree app.config when go switch branches error message below:

output visual studios

also with

git rm --cached app.config

it creates .gitignore file , when commited app.config removed repo don't want.

my goal ignore changes make file keep file in online git repo.

git update-index --skip-worktree hides changes being shown in index, doesn't make changes disappear. if switching branches git needs able update config file, local changes prevent doing (which true whether or not file hidden index).

this workflow have been using lately:

  1. create branch local testing commits only. i'll call test. commit config changes there.
  2. do work on local branch normal. i'll call work. commit small changes go (which practice anyway).
  3. when need run tests updated config file, checkout test , rebase on top of work. (if doing lot can set test track work save keystrokes.)
  4. once test on top of work, can git checkout test use modified configs, or git checkout work resume coding.
  5. when ready publish changes, rebase --interactive squash of temp commits 1 (or more) official change(s). push work, , leave test alone until need local changes again.

Comments

Post a Comment

Popular posts from this blog

PHP and MySQL WP -

i trying accomplish 2 things here code. writing php directly wp page using insert php plugin. 1) query mysql database , return results 1 column 4 columns. 2) make each result own hyperlink directs user new wp page runs new query on page. i able query show results , turn results dynamic hyperlink, cannot formatting down. right returns result 1 column. here have: [insert_php] $servername = "localhost"; $username = "login"; //edited privacy $password = "password"; //edited privacy $database = "database"; //edited privacy // create connection $conn = new mysqli($servername, $username, $password, $database); // check connection if ($conn->connect_error) { die("connection failed: " . $conn->connect_error); } echo "connected successfully"; //get results database $result = mysqli_query($conn,"select mine mines order mine"); $all_property = array(); //declare array saving property //showing proper...
Read more

android - InAppBilling registering BroadcastReceiver in AndroidManifest -

i'm implementing inapp billing in android app. works well, however, i'm trying decouple broadcast receiver activity manifest. suggestion in android's trivialdrive sample: // important: dynamically register broadcast messages updated purchases. // register receiver here instead of <receiver> in manifest // because call getpurchases() @ startup, therefore can ignore // broadcasts sent while app isn't running. // note: registering listener in activity bad idea, done here // because sample. regardless, receiver must registered after // iabhelper setup, before first call getpurchases(). currently there's class extends broadcastreceiver : public class iabbroadcastreceiver extends broadcastreceiver { /** * intent action receiver should filter for. */ public static final string action = "com.android.vending.billing.purchases_updated"; private final iabbroadcastlistener mlistener; public iabbroadcastreceiver(iabbroadcastlistener listener) { m...
Read more

go - golang pprof for c library code -

i have been trying profile golang application pprof, seems details of c code(linked static library) missed in output result. flame graph from frame graph can see c code time consuming reported within "runtime._externalcode", no details @ all. , sure static library compiled debug enable. so there way make pprof details(like stack trace) of 3rd party c code? or there other golang profiling tool this?
Read more