branch - Two conflicting git remotes -


we had issue bad merge couldn't undone cleanly (it reverted 1 of branches, couldn't merged in). created new version of branch last commit, merged new changes cleanly, deleted original , pushed new 1 remote repository.

however, when pull, pulls deleted repository , pushes go new repository. if refresh prune, remote branch no longer visible.

we have branch temporary name we're using stop-gap measure, how using right name?

one solution delete local branch, recreate it, specifying want track remote branch (the 1 right name)

that new local branch should time pull and push to right remote tracking branch.


Comments

Post a Comment

Popular posts from this blog

html - How to custom Bootstrap grid height? -

why bootstrap grid has height 591.067 ? did height came ? .main-post { padding: 20px; background-color: #fff; border: 1px solid #d8d8d8; margin-bottom: 100px; } .main-post .post-categories { margin-bottom: 10px } .main-post h3 { margin: 0 0 10px; color: #777; letter-spacing: -1px; font-weight: bold } .main-post .post-author, .main-post .post-date, .main-post .post-comments { font-size: 12px } .main-post img { display: block; margin: 10px 0; } .main-post .post-summary { line-height: 1.7; color: #888 } .main-post { color: #999 } <div class="col-sm-6"> <div class="main-post"> <h3 class="post-title"> <a href="#"> post title </a> </...
Read more

javascript - pass values from mssql to views in node -

being new node js , javascript . have been trying find solution problem . this app.js file var express=require ('express'); var bodyparser = require('body-parser'); var path = require ('path'); var sql = require('mssql'); var app = express(); const config = { user: 'sa', password: 'password', server: 'localhost\\sqlexpress', // can use 'localhost\\instance' connect named instance database: 'pcgdb', options: { encrypt: false // use if you're on windows azure } }; const request = new sql.request() //view engine app.set('view engine', 'ejs'); app.set('views', path.join(__dirname, 'views')) app.use(bodyparser.json()); app.use(bodyparser.urlencoded({extended: false})); app.get('/',function(req,res){ res.render('index') }); app.get('/new_project', function(req, res) { function(data,err){ ...
Read more

ruby - unknown property method: 'wait' on EC2 windows server Instance -

i running ruby script via terminal on windows instance “windows server 2012 r2” facing error i.e. “unknown property or method: `wait' hresult error code:0x80020006 unknown name. (nomethoderror) “ where same script working on windows machine. note: ruby version, devkit, gems, ruby code & mode of execution same both pc’s(i.e mine & ec2 win instance). only difference is, ec2 windows server , mine not. please me out in resolving above issue.
Read more