add Merging.md

Philipp Scheede commited 2024-12-06 11:05:34 +0100 commit 916daae6223ffbbc9f507ae72cb3f7f8b3530011

				Merging.md
			
          @@ -0,0 +1,5 @@

          +Merging in `git` and in `hg` works the same, opposing to the believe I had over the last 5 years.

          +

          +In `git`, you check out the branch you want to merge into. Then you execute `git merge <branch>`, where `<branch>`, is the branch you want to merge into the current branch.

          +

          +In `hg` (particularly TortoiseHg Workbench), you update to the branch you want to merge into, then select "Merge with Local..." on the commit you want to merge into the current branch.

...	...	@@ -0,0 +1,5 @@
	1	+Merging in `git` and in `hg` works the same, opposing to the believe I had over the last 5 years.
	2	+
	3	+In `git`, you check out the branch you want to merge into. Then you execute `git merge <branch>`, where `<branch>`, is the branch you want to merge into the current branch.
	4	+
	5	+In `hg` (particularly TortoiseHg Workbench), you update to the branch you want to merge into, then select "Merge with Local..." on the commit you want to merge into the current branch.