Git: List the branches for merge in progress -


my team programs in labview, stores of it's source code in binary files. means when "merging" 99% of time you're selection file merge base, or branch.

i'd make visual tool (source tree little pokey in situation). ui run bunch of following commands:

git checkout --ours ... git checkout --theirs ....

my question: there way nice user friendly branch name corresponds "ours" , "theirs"?

the ours branch branch on when started merge, say, whatever head names. (this assumes head names branch, i.e., not on special anonymous "detached head" branch when start merge.)

to symbolic name of current branch:

git symbolic-ref head

this prints full name (refs/heads/master) standard output , exits success (zero) status, or prints fatal: ... message stderr , exits failure (nonzero) status. add -q suppress failure messages; add --short suppress refs/heads/ part output on success.

the name(s), if any, of other branch(es) being merged is/are bit more difficult. git translates arguments raw sha-1 hash ids on. however, also stores names, if there some, in .git/merge_msg:

$ cat .git/merge_msg merge branch 'branchb' brancha $

by reading , parsing file (note: can locate .git directory git rev-parse --git-dir, add /merge_msg, path file) can find branch name, if there one. note file's format (and indeed existence) not officially documented anywhere, prepared change; has been there since relatively days, unchanged long time.


-

Comments

Post a Comment

Popular posts from this blog

PySide and Qt Properties: Connecting signals from Python to QML -

i trying run simple pyside appliccation design made in qml. call function in qml python in separated thread. i have following qml view: import qt 4.7 rectangle { visible: true width: 100; height: 100 color: "lightgrey" text { id: datestr objectname: "datestr" x: 10 y: 10 text: "init text" font.pixelsize: 12 function updatedata(text) { datestr.text = qstr(text) console.log("you said: " + text) } } } here application: some imports.... #!/usr/bin/python import sys import time pyside import qtdeclarative, qtcore pyside.qtgui import qapplication pyside.qtdeclarative import qdeclarativeview the qthread worker.... #worker thread class worker(qtcore.qthread): updateprogress = qtcore.signal(int) def __init__(self, child): qtcore.qthread.__init__(self) self.child = child def run(self):
Read more

c# - DevExpress.Wpf.Grid.InfiniteGridSizeException was unhandled -

Image
when using devexpress, see error: devexpress.wpf.grid.infinitegridsizeexception unhandled message="by default, infinite grid height not allowed since grid rows rendered , hence grid work slowly. fix issue, should place grid container give finite height grid, or should manually specify grid's height or maxheight. note can avoid exception setting gridcontrol.allowinfinitegridsize static property true, in case grid run slowly." the problem dxgrid has infinite height. to fix, set height non-infinite. snoop absolutely invaluable this: if "height" xaml element infinite (i.e. 0 or nan ), can set using one of following: option 1: height="{binding path=actualheight, relativesource={relativesource mode=findancestor, ancestortype=uielement}}" option 2: verticalalignment="stretch" option 3: height="auto" hint: use verticalalignment="stretch" if child of grid <rowdefinition height=
Read more

scala - 'wrong top statement declaration' when using slick in IntelliJ -

Image
i'm porting project scala 2.9 2.10, therefore have use slick instead of scalaquery. i'm using slick 2.1.0 since supports ms access. according this tutorial , upgrade guide changed robs object class , added val robs : why error message wrong top statement declaration , how rid of it? edit: i'm new scala... according this question seems can't put val outside of methods or classes, right? code above directly in packge. right approach slick then? should move code in class or trait? according this changed val robs = tablequery[robs] to object robs extends tablequery(new robs(_)) {} . no warnings or errors anymore. :)
Read more