branching-and-merging

I committed some changes in the branch new . I checkout out to master . When I tried to merge: $ git merge new Auto-merging js/site.js CONFLICT (content): Merge conflict in js/site.js Automatic merge failed; fix conflicts and then commit the result. So I installed kdiff3 and configured my config files and when I tried to use mergetools I got: $ git mergetool kdiff3 No files need merging I ran a diff and it outputted this: diff --cc js/site.js index 8c17d62,7955b13..0000000 --- a/js/site.js +++ b/js/site.js @@@ -72,4 -81,18 +81,22 @@@ function doSmallScreen() $(document).ready(function () {

I am trying to get a prebuild merge to work inside a multibranch pipeline and I would like to avoid having to hardcode the git url in my pipeline script. It seems like scm step must store the url somehow, but I cannot figure out how to access it. You are correct, the scm object does have the information you need. When using git as the source control in a Pipeline project (or Multibranch Pipeline project), the scm global variable will be an instance of GitSCM . That means that `scm.getUserRemoteConfigs()' will return a list of UserRemoteConfig instances. Those instances have the git remote's

I am used to having one main branch (master) and working in topic branches. But I'm working on a project now with two main branches (master and experimental) and I am unsure how to best merge my topic branch into both? Is this the right way to do it? If not can someone let me know the right way. (master)$ git checkout -b bugfix # do bug fix here (bugfix)$ git commit -a -m 'Fixed bug.' (bugfix)$ git checkout master (master)$ git merge bugfix (master)$ git checkout bugfix (bugfix)$ git rebase experimental (bugfix)$ git checkout experimental (experimental)$ git merge bugfix Thank you. Don't do

Lets say we have two branches ( B and C ) that have diverged from a common ancestor A . Will merging from B to C produce the same result as merging from C to B ? A | / \ B C To clarify- I'm assuming that any manual merge conflict resolutions will occur in both directions. But will any automatic merges that occur result in the same code being chosen? This is what I'm assuming, since the commit dates are identical in both directions. To further clarify - I know that the actual merging results in "mirror images" of each other based on the direction. I'm just asking about the automatically

When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged? Is it possible to merge only certain files, instead of whole changeset? WARNING: such a "dummy merge", as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to -- you will not see the changes. Or if you merge into the other branch, the changes on that other branch will be undone. If all you want