git workflow in research environment -


working on academic research still haven't found git workflow our project.

setting: have main project kept in branch master. when new idea emerges new branch created support research. there several parallel researches on main project driven different people.

when working on research branch r (it can take months, , many commits). of commits not directly connected research , improving project itself... want push these commits master branch (they can helpful others).

how should this? cherry-pick? seems me, after lot of cherry-picks (from more people , different branches) difficult merge branch r master @ end.

maybe better option switch master before commit, make commit, switch , pull updates master. seems difficult, 3 reasons:

  1. switch master not easy because many files not committed in conflict etc. (i need use stash somehow)
  2. sometimes realize later, should push older commit(s) r master.
  3. sometimes not want other updates master else. useful later don't have time deal them @ moment.

what proper way of doing it?

you consider:

  • (on branch r) git rebase --interactive: in order reorder commits, 1 want on master first, followed 1 specifics r
  • (on branch master) merge sha1 (the right sha1 of last commit want on master)

but change history of r branch, can issue of others have cloned (you need communicate event, asking them reset r branch new 1 have changed , push).


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