Someone accepted a pull request which they shouldn’t have. Now we have a bunch of broken code merged in. How do you undo a pull request? I was just going to revert the changes to the commit just before the merge, but I noticed that it merged in a bunch of commits. So now there … Read more
Wikipedia says a 3-way merge is less error-prone than a 2-way merge, and often times doesn’t need user intervention. Why is this the case? An example where a 3-way merge succeeds and a 2-way merge fails would be helpful. 4 Answers 4
Take the following case: I have some work in a topic branch and now I’m ready to merge back to master: * eb3b733 3 [master] [origin/master] | * b62cae6 2 [topic] |/ * 38abeae 1 I perform the merge from master, resolve the conflicts and now I have: * 8101fe3 Merge branch ‘topic’ [master] |\ … Read more
I know how to merge modification using vimdiff, but, assuming I just know that the entire file is good to keep or to throw away, how do I do that? I don’t want to open vimdiff for each of them, I change want a command that says ‘keep local’ or ‘keep remote’. E.G: I got … Read more
I have branch Master, branchA and branchB. Now I’m working in the branchA and I need to merge branchA with branchB and proceed my work in the branchA. All files are comitted in the branchA and branchB. What’s the fast way to implement it? 8 Answers 8
I’ve finished working on a feature branch feature-x. I want to merge results back to the default branch and close feature-x in order to get rid of it in the output of hg branches. I came up with the following scenario, but it has some issues: $ hg up default $ hg merge feature-x $ … Read more
I want a diff of all changes in a branch that is not merged to master yet. I tried: git diff master git diff branch..master git diff branch…master However, in each of these cases the diff contains content in master that has not been merged into my branch yet. Is there a way to do … Read more
I have the following dataframes: > df1 id begin conditional confidence discoveryTechnique 0 278 56 false 0.0 1 1 421 18 false 0.0 1 > df2 concept 0 A 1 B How do I merge on the indices to get: id begin conditional confidence discoveryTechnique concept 0 278 56 false 0.0 1 A 1 421 … Read more
I have 3 CSV files. Each has the first column as the (string) names of people, while all the other columns in each dataframe are attributes of that person. How can I “join” together all three CSV documents to create a single CSV with each row having all the attributes for each unique value of … Read more
I can’t really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there’s an –ff option would seem to imply that there’s a … Read more