andre/30-seconds-of-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge some snippets

Browse Source
This commit is contained in:
Angelos Chalaris
2023-05-27 12:31:09 +03:00
parent de658b08ec
commit e61491196b
3 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
snippets/git/s/fast-forward.md → snippets/git/s/fast-forward-merge.md
View File

@ -1,6 +1,6 @@
---
title: How does Git's fast-forward mode work?
shortTitle: Git fast-forward
shortTitle: Fast-forward merge
type: question
language: git
tags: [branch]

34
snippets/git/s/merge-branch-merge-commit.md
View File

@ -1,23 +1,41 @@
---
title: Merge a branch and create a merge commit
type: snippet
title: Merge a branch in Git
shortTitle: Merge branch
type: story
language: git
tags: [repository,branch]
author: chalarangelo
cover: meteora
dateModified: 2021-04-13T21:10:59+03:00
excerpt: Learn how to merge a branch in Git with or without creating a merge commit, depending on your team's workflow.
dateModified: 2023-05-26T21:10:59+03:00
---
Merges a branch into the current branch, creating a merge commit.
Branches are Git's way to organize separate lines of development, allowing a team to work multiple features in parallel. But at some point, you'll want to **merge a branch into another branch**, usually `master` or `main`. Depending on your team's workflow, merging a branch might create a merge commit or not.
- Use `git checkout <target-branch>` to switch to the branch into which you want to merge.
- Use `git merge --no-ff -m <message> <source-branch>` to merge a branch into the current branch, creating a merge commit with the specified `<message>`.
### Merging a branch
In order to merge a branch, you want to **switch to the target branch** first, using `git checkout`. Then, you can use `git merge` to **merge the source branch into the target branch**.
```shell
git checkout <target-branch>
git merge --no-ff -m <message> <source-branch>
# Syntax:
# git checkout <target-branch>
# git merge <source-branch>
git checkout master
git merge patch-1 # Merges the `patch-1` branch into `master`
```
By default, Git will use [fast-forward merge](/git/s/fast-forward-merge) to merge the branch. This means that it will create a **linear history**, by placing the commits from the source branch at the tip of the target branch.
### Creating a merge commit
If, instead, you want to **create a merge commit**, you can use the `--no-ff` flag when merging. This will create a merge commit at the tip of the target branch, optionally referencing the source branch in the commit message. The rest of the process remains the same.
```shell
# Syntax:
# git checkout <target-branch>
# git merge --no-ff -m <message> <source-branch>
git checkout master
git merge --no-ff -m "Merge patch-1" patch-1
# Merges the `patch-1` branch into `master` and creates a commit

23
snippets/git/s/merge-branch.md
View File

@ -1,23 +0,0 @@
---
title: Merge a branch
type: snippet
language: git
tags: [repository,branch]
cover: sparkles
dateModified: 2021-04-13T21:10:59+03:00
---
Merges a branch into the current branch.
- Use `git checkout <target-branch>` to switch to the branch into which you want to merge.
- Use `git merge <source-branch>` to merge a branch into the current branch.
```shell
git checkout <target-branch>
git merge <source-branch>
```
```shell
git checkout master
git merge patch-1 # Merges the `patch-1` branch into `master`
```