What does this git log mean? -

-

this recent log of git.

commit 608991c merge: 5c0c062 1fe65f9 author: foo date:   mon jul 2       merge branch 'mybranch' of xxx.xxx.xxx.xxx:/myproject mybranch      conflicts:         bar.c

does log mean user foo merge operation?

as described in "merging conflict: conflicts , resolutions", automatic log message generated after resolution of merge conflicts.

you can see message built in git source file builtin/merge.c, in suggest_conflicts() function

static int suggest_conflicts(int renormalizing) {     const char *filename;     file *fp;     int pos;      filename = git_path("merge_msg");     fp = fopen(filename, "a");     if (!fp)         die_errno(_("could not open '%s' writing"), filename);     fprintf(fp, "\nconflicts:\n");

from user point of view:

resolve conflict

after have resolved conflict (by changing readme file way want git merge), have tell git conflict resolved adding conflicted file index.

in case, need add readme git index.
git status no longer complain readme file having conflict:

$ git add readme $ git status # on branch master # changes committed: # #   modified:   readme #   new file:   plan #

we're ready commit merge:

$ git commit [master 368a14a] merge branch 'test'

the git log command shows resolved conflict:

$ git log commit 368a14a034eda95ee401bb56b3bb8df04b84ab0c merge: 3330113 c406564 author: tim flagg  date:   fri mar 25 13:26:10 2011 -0700      merge branch 'test'      conflicts:         readme

gitg --all shows merge:

merge in logs


Comments

Post a Comment

Popular posts from this blog

c# - SVN Error : "svnadmin: E205000: Too many arguments" -

-
i trying reposotries using c# code process svncommand = null; var psi = new processstartinfo("svnadmin"); psi.redirectstandardoutput = true; psi.redirectstandarderror = true; psi.useshellexecute = false; psi.arguments= @"dump c:\repositories\myrepo > c:\temp\myrepodumpfile.dump"; using (svncommand = process.start(psi)) { var myoutput = svncommand.standardoutput; var myerror = svncommand.standarderror; debug.write("output :" + environment.newline + environment.newline + myoutput.readtoend() + environment.newline + "error :" + environment.newline + environment.newline + myerror.readtoend()); svncommand.close(); } when use dump command commandline svnadmin dump c:\repositories\myrepo > c:\temp\myrepodumpfile.dump it works fine when try ...
Read more

c# - Copy ObservableCollection to another ObservableCollection -

-
how copy observablecollection item observablecollection without reference of first collection? here observablecollection item value changes affecting both collections. code private observablecollection<ratemodel> _allmetalrate = new observablecollection<ratemodel>(); private observablecollection<ratemodel> _metalrateondate = new observablecollection<ratemodel>(); public observablecollection<ratemodel> allmetalrate { { return this._allmetalrate; } set { this._allmetalrate = value; notifypropertychanged("metalrate"); } } public observablecollection<ratemodel> metalrateondate { { return this._metalrateondate; } set { this._metalrateondate = value; notifypropertychanged("metalrateondate"); } } foreach (var item in metalrateondate) allmetalrate.add(item); what causing , how can solve it? you need clone object referenced item before it's a...
Read more

All overlapping substrings matching a java regex -

-
is there api method returns (possibly overlapping) substrings match regular expression? for example, have text string: string t = 04/31 412-555-1235; , , have pattern: pattern p = new pattern("\\d\\d+"); matches strings of 2 or more characters. the matches are: 04, 31, 412, 555, 1235. how overlapping matches? i want code return: 04, 31, 41, 412, 12, 55, 555, 55, 12, 123, 1235, 23, 235, 35. theoretically should possible -- there obvious o(n^2) algorithm enumerates , checks substrings against pattern. edit rather enumerating substrings, safer use region(int start, int end) method in matcher . checking pattern against separate, extracted substring might change result of match (e.g. if there non-capturing group or word boundary check @ start/end of pattern). edit 2 actually, it's unclear whether region() expect zero-width matches. specification vague, , experiments yield disappointing results. for example: string line = "xx90xx"; strin...
Read more