https://github.com/44437/git-merge-strategies

https://github.com/44437/git-merge-strategies

Last synced: 7 days ago
JSON representation

• Host: GitHub
• URL: https://github.com/44437/git-merge-strategies
• Owner: 44437
• Created: 2022-07-23T19:42:36.000Z (over 2 years ago)
• Default Branch: master
• Last Pushed: 2022-07-23T21:01:39.000Z (over 2 years ago)
• Last Synced: 2024-07-23T18:33:04.590Z (4 months ago)
• Size: 8.79 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
# git-merge-strategies

fast forward 1

fast forward 2

fast forward 3

fast forward 4

```shell

git rebase branch_name

```

recursive 1

recursive 2

recursive 3

recursive 4

```shell

git merge --no-ff branch_name

```

theirs merge 1

theirs merge 2

theirs merge 3

theirs merge 4

```shell

git merge -X theirs branch_name

```

resolve 1

resolve 2

resolve 3

```shell

git merge -s resolve branch_name

```

subtree 1

subtree 2

subtree 3

```shell

git merge -s subtree branch_name

```