github - Git pull origin <branch> overwrites master? -


i have repository on github, aav1

on laptop have 2 branches, 1 called master , 1 called vs12up master branch when software visual studio 2008, vs12up converted visual studio 2012.

on laptop seems fine , pushed new branch github, appears correct.

on desktop tried pull remote branch:

git pull origin vs12up

it wrote changes master branch on desktop, git log shows commits made on vs12up branch, git branch shows master, current branch.

how can revert changes master branch , pull vs12up branch on desktop match repository on laptop?

if git pull remote branch name, fetch remote branch , merge current local branch. undo that, first have reset local branch remote master, create new local vs12up branch corresponding remote branch.

  1. reset local master match remote repository's master (warning: sure don't have uncommitted changes want keep before issuing following command):

    git reset --hard origin/master

  2. fetch remote branches local repository:

    git fetch origin

  3. create new local vsup12 branch remote vsup12 branch, , switch new local branch:

    git checkout -b vsup12 origin/vsup12

note when subsequently git pull while switched vsup12 branch, you'll fetch , merge latest changes vsup12 branch on github local vsup12


Comments

Post a Comment

Popular posts from this blog

linux - xterm copying to CLIPBOARD using copy-selection causes automatic updating of CLIPBOARD upon mouse selection -

i've tried various ways coerce xterm (versions 285 , 292) copy selection clipboard clipboard whenever press ctrl-shift-c. promising way far has been, in ~/.xresources, put this: xterm*vt100.translations: #override \ ctrl shift <keypress> c: copy-selection(clipboard) \n\ ctrl shift <keypress> v: insert-selection(clipboard) ctrl-shift-v works perfectly, copying has nuance... if restart xterm, highlighting text puts things in primary clipboard; expected, proper, default behavior. if hit ctrl-shift-c, copies current selection clipboard clipboard. the bug, however, if highlight text after first time pressed ctrl-shift-c, you'll see highlighting copies both primary and clipboard. cannot figure out how stop xterm updating clipboard upon selection... , doesn't make sense me in first place. i said, @ specific point in time, copy selection clipboard... yet starts updating automatically upon selection after doing once... anyone have workaround...
Read more

c++ - qgraphicsview horizontal scrolling always has a vertical delta -

Image
i've subclassed qgraphicsview custom canvas used in cad application. i've reimplemented qgraphicsview::wheelevent check keyboard modifiers control key and, if control key pressed, zoom. i'm trying implement horizontal scroll when user holds shift , uses wheel. the problem i'm having horizontal scrolling always scrolls 0.279. not huge problem, hugely annoying , points else being wrong. so, here questions: is right way implement horizontal scrolling? if not, is? how eliminate delta of 0.279? thanks in advance. code , sample output below void myview::zoom(int delta) { double factor = pow(1.2, delta/abs(delta)); this->scale(factor, factor); } void myview::scrollhorizontal(int level) { qpointf center = maptoscene(viewport()->rect().center()); qdebug() << "center: " << center.x() << ", " << center.y(); centeron(qpointf(center.x() - level, center.y())); } void myview::wheelevent(qwheeleve...
Read more