Difference between revisions of "Git merge"
Jump to navigation
Jump to search
(10 intermediate revisions by 3 users not shown) | |||
Line 1: | Line 1: | ||
{{lowercase}} | {{lowercase}} | ||
− | <code>[[git]] merge</code> | + | <code>[[git]] merge</code>, join two or more development histories together. |
+ | * https://git-scm.com/docs/git-merge | ||
− | + | [[git merge origin/main]] | |
+ | Already up to date. | ||
<code>[[git merge main]]</code> | <code>[[git merge main]]</code> | ||
Line 8: | Line 10: | ||
== Related == | == Related == | ||
* <code>[[git push]]</code> | * <code>[[git push]]</code> | ||
+ | * <code>[[git checkout]]</code> | ||
+ | * <code>[[git branch]]</code> | ||
+ | * <code>[[git request-pull]]</code> | ||
+ | * <code>[[git fetch]]</code> | ||
+ | * [[Merge Request (MR)]] | ||
+ | * <code>[[git push -o merge_request.create]]</code> | ||
== See also == | == See also == | ||
* {{git merge}} | * {{git merge}} | ||
− | * {{ | + | * {{MR}} |
[[Category:Software development]] | [[Category:Software development]] | ||
[[Category:Git]] | [[Category:Git]] |
Latest revision as of 10:40, 24 November 2022
git merge
, join two or more development histories together.
git merge origin/main Already up to date.
Related[edit]
git push
git checkout
git branch
git request-pull
git fetch
- Merge Request (MR)
git push -o merge_request.create
See also[edit]
Advertising: