c# - Is this Git merge already complete - or how to complete it with kdiff3? -


background

i'm newish git , resolving first merge conflict. i'm working in c# using visual studio on scott lilly c# superadventure tutorial. while building tutorial, i'm using github learn scm , git well. part of process, learned have clean master directly follows tutorial without deviation, create branch each chapter, , merge master @ end, , keep experiments on separate branches - way experiments never conflict tutorial when creates new features or refactors existing code.

so far, good. 1 of experiments adding unit tests. started separate unittesting branch, , decided pull in changes master branch keep up-to-date. on first merge, had conflict, in visual studio project file project adding unit tests to, due different packages being installed. not big deal, mechanics tripping me up. there 5 conflicts additions, can merged directly, , 1 case of true conflict. i've gotten of way through it, need final help.

step-by-step far

i'm using a public repo on github, , visual studio 2017 community on windows 10 vs github extension , local git repo - let's face it, visual studio plug-in commands quite limited normal workflow items. - i've started using git bash needed command-line, , git extensions git gui, working pretty well.

i completed chapter 23 of tutorial, , merged chap_23 branch master. tried merge master unittesting, got conflict in superadventureconsole/superadventureconsole.csproj file. git status @ point shows:

$ git status on branch unittesting branch ahead of 'origin/unittesting' 1 commit.   (use "git push" publish local commits) have unmerged paths.   (fix conflicts , run "git commit")   (use "git merge --abort" abort merge)  changes committed:          modified:   superadventure.sln         modified:   superadventureconsole/app.config         modified:   superadventureconsole/properties/assemblyinfo.cs  unmerged paths:   (use "git add <file>..." mark resolution)          both modified:   superadventureconsole/superadventureconsole.csproj  untracked files:   (use "git add <file>..." include in committed)          superadventureconsole/superadventureconsole.csproj.base         superadventureconsole/superadventureconsole.csproj.local         superadventureconsole/superadventureconsole.csproj.remote         superadventureconsole/superadventureconsole.csproj.orig

at point ran git mergetool based on q: how resolve merge conflicts in git?, runs kdiff3 merge tool (on setup, anyway), original file a file, , local , remote b , c (i'm not sure which). able blunder through one, , pick between b , c each conflict (6 total). got stuck.

at first output file (at bottom below a, b, , c in kdiff3) wasn't taking, on 3rd try, saved , exited kdiff3, , there no longer merge conflict:

$ git mergetool no files need merging

but, still have untracked files, per "git status":

$ git status on branch unittesting branch ahead of 'origin/unittesting' 1 commit.   (use "git push" publish local commits) conflicts fixed still merging.   (use "git commit" conclude merge)  changes committed:          modified:   superadventure.sln         modified:   superadventureconsole/app.config         modified:   superadventureconsole/properties/assemblyinfo.cs         modified:   superadventureconsole/superadventureconsole.csproj  untracked files:   (use "git add <file>..." include in committed)          superadventureconsole/superadventureconsole.csproj.base         superadventureconsole/superadventureconsole.csproj.local         superadventureconsole/superadventureconsole.csproj.remote         superadventureconsole/superadventureconsole.csproj.orig

question(s)

it looks modified file saved output kdiff3 , therefore added index, , therefore can commit. correct? assume in case commit complete merge?

overall, i'm not sure happened here - why "git status" show 4 untracked files extension (i.e. .base, .local, .remote, , .orig), shows superadventureconsole/superadventureconsole.csproj without extension in "modified" file list?

i understand .local , .remote, difference between .base , .orig? 1 of these should parent of both branches, 1 it, , other one?

also, there can git bash or using git extensions or git gui double check whether merge ready commit way expect?

thanks!!

it looks modified file saved output kdiff3 , therefore added index, , therefore can commit. correct? assume in case commit complete merge?

this looks it's case. use git diff --cached (or git diff --staged, if prefer: both same thing) compare what's in index right now, i.e., go in new commit, what's in current commit right now. see answer second question.

(git status same git diff --cached --name-status, see files added, deleted, or modified, , not actual change is.)

overall, i'm not sure happened here - why "git status" show 4 untracked files extension (i.e. .base, .local, .remote, , .orig) ...

this bit of mystery: suggests still have git mergetool running.

what git mergetool grub around through mess left behind in index after failed merge. remember, index, aka staging area or cache—three names 1 thing—is place build next commit. has 1 copy of each file go new commit. during failing merge, though, can have three copies of each failed-merge file instead of one.

(it seems 1 file's automatic merge failed, namely superadventureconsole/superadventureconsole.csproj.)

the 3 copies in index are:

  • the merge-base version of file.
  • the current (head, --ours, or—aha!—local) version of file.
  • the other (--theirs or, poor name, remote) version of file.

files in index in special, git-only form, git mergetool extract each of these ordinary file in work-tree. copies failed-merge-result file, left behind in superadventureconsole/superadventureconsole.csproj, .orig.

then, git mergetool runs chosen file-merge program. manipulate file in program. when done, save file , exit. mergetool script compares .orig file final version see if fixed anything, and/or looks @ exit code program.

if looks did failed merge, git mergetool script should remove @ least three, , four, of these files. fact did not suggests git mergetool still running. might check , make sure isn't. perhaps killed off , never had chance clean up.

i understand .local , .remote, difference between .base , .orig? 1 of these should parent of both branches, 1 it, , other one?

the .local file --ours version index (git show :2:<path>, during conflict). .remote file --theirs version (git show :3:<path>). .base file merge-base version (common parent, said; git show :1:<path>). .orig backup of whatever file-level merge left behind. mergetool script uses compare what's left in original file when chosen merge-program exits.


Comments

Post a Comment

Popular posts from this blog

android - InAppBilling registering BroadcastReceiver in AndroidManifest -

i'm implementing inapp billing in android app. works well, however, i'm trying decouple broadcast receiver activity manifest. suggestion in android's trivialdrive sample: // important: dynamically register broadcast messages updated purchases. // register receiver here instead of <receiver> in manifest // because call getpurchases() @ startup, therefore can ignore // broadcasts sent while app isn't running. // note: registering listener in activity bad idea, done here // because sample. regardless, receiver must registered after // iabhelper setup, before first call getpurchases(). currently there's class extends broadcastreceiver : public class iabbroadcastreceiver extends broadcastreceiver { /** * intent action receiver should filter for. */ public static final string action = "com.android.vending.billing.purchases_updated"; private final iabbroadcastlistener mlistener; public iabbroadcastreceiver(iabbroadcastlistener listener) { m...
Read more

python Tkinter Capturing keyboard events save as one single string -

is possible store keyboard events 1 string? code below stores 1 char , prints it. card reader or bar code reader, contains collection of character/ string not 1 character @ time. goal save char pressed text variable. from tkinter import * root = tk() def key(event): text= event.char text+= event.char print ("pressed", text) def callback(event): frame.focus_set() print ("clicked at", event.x, event.y) frame = frame(root, width=100, height=100) frame.bind("<key>", key) frame.bind("<button-1>", callback) frame.pack() root.mainloop() currently, creating text variable , everytime key() function gets called, , text stores last character typed. you can define text module level variable , , use module level text inside key function - text = '' def key(event): global text text+= event.char print("pressed", text)
Read more

sql server - Why does Linq-to-SQL add unnecessary COUNT()? -

here tables: create table customer ( cid int primary key, name varchar(32) ) create table ord ( oid int primary key, cid int foreign key references customer, address varchar(20) ) here's linq-to-sql statement: var aaa = c in db.customer select new { c, o = c.ord.tolist() }; and here's inexplicable query generated linq-to-sql: select [t0].[cid] [cid], [t0].[name] [name], [t1].[oid] [oid], [t1].[cid] [cid2], [t1].[address] [address], (select count(*) [dbo].[ord] [t2] [t2].[cid] = [t0].[cid]) [value] [dbo].[customer] [t0] left outer join [dbo].[ord] [t1] on [t1].[cid] = [t0].[cid] order [t0].[cid], [t1].[oid] i want understand how rid of count(*) part. it's entirely uncalled for! linq needs count(*) in order determine number of entries returned o = c.ord.tolist() .
Read more