Starting with X stable / a—b—c—d—e—f—g development You can use the following steps to copy the last commit from your development branch to your stable branch: git checkout development@{0} # get working tree from “development”, detach HEAD git reset –soft stable # reposition detached HEAD on “stable” git commit # enter the appropriate commit message … Read more
You can use the output clause to capture the modified/inserted rows to a table variable and use that with a delete statement after the merge. DECLARE @T TABLE(EmployeeID INT); MERGE Target1 AS T USING Source1 AS S ON (T.EmployeeID = S.EmployeeID) WHEN NOT MATCHED BY TARGET AND S.EmployeeName LIKE ‘S%’ THEN INSERT(EmployeeID, EmployeeName) VALUES(S.EmployeeID, S.EmployeeName) … Read more
If your goal is indeed to keep one version or the other, then yes, you will want to use: git checkout <–theirs|–ours> <path> git add <path> Of course, as you say, it’s not ideal. If there’s any way you can avoid this, you should. If you can, try to adopt workflow habits which avoid changing … Read more
What you need to do is: Sort items lexicographically where range key is [r_start,r_end] Iterate the sorted list and check if current item overlaps with next. If it does extend current item to be r[i].start,r[i+1].end, and goto next item. If it doesn’t overlap add current to result list and move to next item. Here is … Read more
The query you have will give the error Msg 8156, Level 16, State 1, Line 59 The column ‘AnotherKey’ was specified multiple times for ‘tmpTable’. That is because you are using * in the using clause and AnotherKey is part of both table2 and table3. Specify the columns you need. Also there is no use … Read more
This error can occur when you have changed the core.autocrlf config option but have not deleted and re-checked-out your working tree. So either change core.autocrlf back to what it was, or push up your changes, delete your repo and clone it again.
Use ArrayList.addAll(). Something like this should work (assuming lists contain String objects; you should change accordingly). List<String> combined = new ArrayList<String>(); combined.addAll(firstArrayList); combined.addAll(secondArrayList); combined.addAll(thirdArrayList); Update I can see by your comments that you may actually be trying to create a 2D list. If so, code such as the following should work: List<List<String>> combined2d = new … Read more
Download the latest .dmg package for Mac from here: Meld for OSX Set meld as your git difftool/mergetool by editing your ~/.gitconfig and adding the following lines, as mentioned in the above link: [diff] tool = meld [difftool] prompt = false [difftool “meld”] trustExitCode = true cmd = open -W -a Meld –args \”$LOCAL\” \”$PWD/$REMOTE\” … Read more
A generator will solve your problem nicely. def imerge(a, b): for i, j in itertools.izip(a,b): yield i yield j