القائمة الرئيسية

الصفحات

جيت جيت هاب

شرح شامل لـ git merge مع أمثلة توضيحية

18 يوليو 2023

git merge

شرح git merge بالصور

شرح شامل لـ git merge مع أمثلة توضيحية

"git merge" هو أمر مهم في Git يُستخدم لدمج التغييرات من فرع إلى فرع آخر. عندما تعمل على مشروع مع فروع متعددة وترغب في دمج التغييرات التي تم إجراؤها في فرع إلى فرع آخر، يمكنك استخدام "git merge"

شرح مفصل لكيفية استخدام "git merge"

رابط أفضل دورة تعلم Git و GitHub للمبتدئين والمحترفين

https://www.youtube.com/playlist?list=PLMTdZ61eBnypdpBVn2kb-2yizuEL7Phyj

لقد تعرفت الآن على "git merge" وكيفية استخدامه لدمج التغييرات من فرع إلى فرع آخر في مستودع Git. يمكنك استخدام هذا الأمر للدمج والتنسيق بين التغييرات التي تتم على الفروع المختلفة في مشروعك. استفد من إمكانات Git في إدارة الفروع والعمل الجماعي بفعالية في مشاريعك.

جيت جيت هاب دورة git كورس git git github

أخر المواضيع من قسم : جيت

تعليقات

تنويه

عزيز الطالب/الطالبة : هذه المدونة لا يتم إدارتها بواسطة Coder Shiyar، وإنما بواسطة بعض المتطوعين بهدف مساعدتكم. محتوى هذه المدونة لم يتم كتابته بواسطة كودر شيار. لذلك إن كان هناك أي مشكلة فيرجى التواصل مع كودر شيار عبر تعليقات قناته في اليوتيوب. نتمنى لكم الخير والتوفيق في حياتكم.

window['__wavt'] = 'AOuZoY5cNKHtOy0C5lXiEO2-ehq66Fakeg:1732178529310';_WidgetManager._Init('//www.blogger.com/rearrange?blogID\x3d8844110639766314670','//blog.codershiyar.com/2023/07/comprehensive-guide-git-merge-examples.html','8844110639766314670'); _WidgetManager._SetDataContext([{'name': 'blog', 'data': {'blogId': '8844110639766314670', 'title': '\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646', 'url': 'https://blog.codershiyar.com/2023/07/comprehensive-guide-git-merge-examples.html', 'canonicalUrl': 'https://blog.codershiyar.com/2023/07/comprehensive-guide-git-merge-examples.html', 'homepageUrl': 'https://blog.codershiyar.com/', 'searchUrl': 'https://blog.codershiyar.com/search', 'canonicalHomepageUrl': 'https://blog.codershiyar.com/', 'blogspotFaviconUrl': 'https://blog.codershiyar.com/favicon.ico', 'bloggerUrl': 'https://www.blogger.com', 'hasCustomDomain': true, 'httpsEnabled': true, 'enabledCommentProfileImages': true, 'gPlusViewType': 'FILTERED_POSTMOD', 'adultContent': false, 'analyticsAccountNumber': 'UA-210120345-1', 'encoding': 'UTF-8', 'locale': 'ar', 'localeUnderscoreDelimited': 'ar', 'languageDirection': 'rtl', 'isPrivate': false, 'isMobile': false, 'isMobileRequest': false, 'mobileClass': '', 'isPrivateBlog': false, 'isDynamicViewsAvailable': true, 'feedLinks': '\x3clink rel\x3d\x22alternate\x22 type\x3d\x22application/atom+xml\x22 title\x3d\x22\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646 - Atom\x22 href\x3d\x22https://blog.codershiyar.com/feeds/posts/default\x22 /\x3e\n\x3clink rel\x3d\x22alternate\x22 type\x3d\x22application/rss+xml\x22 title\x3d\x22\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646 - RSS\x22 href\x3d\x22https://blog.codershiyar.com/feeds/posts/default?alt\x3drss\x22 /\x3e\n\x3clink rel\x3d\x22service.post\x22 type\x3d\x22application/atom+xml\x22 title\x3d\x22\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646 - Atom\x22 href\x3d\x22https://www.blogger.com/feeds/8844110639766314670/posts/default\x22 /\x3e\n\n\x3clink rel\x3d\x22alternate\x22 type\x3d\x22application/atom+xml\x22 title\x3d\x22\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646 - Atom\x22 href\x3d\x22https://blog.codershiyar.com/feeds/2890934019331810803/comments/default\x22 /\x3e\n', 'meTag': '', 'adsenseClientId': 'ca-pub-2175466776333013', 'adsenseHostId': 'ca-host-pub-1556223355139109', 'adsenseHasAds': true, 'adsenseAutoAds': true, 'boqCommentIframeForm': true, 'loginRedirectParam': '', 'view': '', 'dynamicViewsCommentsSrc': '//www.blogblog.com/dynamicviews/4224c15c4e7c9321/js/comments.js', 'dynamicViewsScriptSrc': '//www.blogblog.com/dynamicviews/8f7002974bbf4dbb', 'plusOneApiSrc': 'https://apis.google.com/js/platform.js', 'disableGComments': true, 'interstitialAccepted': false, 'sharing': {'platforms': [{'name': '\u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0627\u0644\u0631\u0627\u0628\u0637', 'key': 'link', 'shareMessage': '\u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0627\u0644\u0631\u0627\u0628\u0637', 'target': ''}, {'name': 'Facebook', 'key': 'facebook', 'shareMessage': '\u0645\u0634\u0627\u0631\u0643\u0629 \u0625\u0644\u0649 Facebook', 'target': 'facebook'}, {'name': '\u0643\u062a\u0627\u0628\u0629 \u0645\u062f\u0648\u0646\u0629 \u062d\u0648\u0644 \u0647\u0630\u0647 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629', 'key': 'blogThis', 'shareMessage': '\u0643\u062a\u0627\u0628\u0629 \u0645\u062f\u0648\u0646\u0629 \u062d\u0648\u0644 \u0647\u0630\u0647 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629', 'target': 'blog'}, {'name': 'X', 'key': 'twitter', 'shareMessage': '\u0645\u0634\u0627\u0631\u0643\u0629 \u0625\u0644\u0649 X', 'target': 'twitter'}, {'name': 'Pinterest', 'key': 'pinterest', 'shareMessage': '\u0645\u0634\u0627\u0631\u0643\u0629 \u0625\u0644\u0649 Pinterest', 'target': 'pinterest'}, {'name': '\u0628\u0631\u064a\u062f \u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a', 'key': 'email', 'shareMessage': '\u0628\u0631\u064a\u062f \u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a', 'target': 'email'}], 'disableGooglePlus': true, 'googlePlusShareButtonWidth': 0, 'googlePlusBootstrap': '\x3cscript type\x3d\x22text/javascript\x22\x3ewindow.___gcfg \x3d {\x27lang\x27: \x27ar\x27};\x3c/script\x3e'}, 'hasCustomJumpLinkMessage': true, 'jumpLinkMessage': 'Read more \xbb', 'pageType': 'item', 'postId': '2890934019331810803', 'postImageThumbnailUrl': 'https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjBKC6j6-Qoc6S3JnwnibfOSl9sqlI58KtXWD2t77ponA20QzIijeuagYO-z384ZRSf1o-TOHSynMVeYdcxOJMquIBfL_UmwaaC4dJj3y5b5YwxV1Z4n9zzY3RXLtQPHwlItqpM4DumHhuz12CyKzAzv2tDCHJYqysEY9yEpfHfA2y2po1jjR_cSMIAHDtM/s72-c/Git%20and%20GitHub%20Tutorial%20-%20Lesson%20(18).png', 'postImageUrl': 'https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjBKC6j6-Qoc6S3JnwnibfOSl9sqlI58KtXWD2t77ponA20QzIijeuagYO-z384ZRSf1o-TOHSynMVeYdcxOJMquIBfL_UmwaaC4dJj3y5b5YwxV1Z4n9zzY3RXLtQPHwlItqpM4DumHhuz12CyKzAzv2tDCHJYqysEY9yEpfHfA2y2po1jjR_cSMIAHDtM/s16000/Git%20and%20GitHub%20Tutorial%20-%20Lesson%20(18).png', 'pageName': '\u0634\u0631\u062d \u0634\u0627\u0645\u0644 \u0644\u0640 git merge \u0645\u0639 \u0623\u0645\u062b\u0644\u0629 \u062a\u0648\u0636\u064a\u062d\u064a\u0629', 'pageTitle': '\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646: \u0634\u0631\u062d \u0634\u0627\u0645\u0644 \u0644\u0640 git merge \u0645\u0639 \u0623\u0645\u062b\u0644\u0629 \u062a\u0648\u0636\u064a\u062d\u064a\u0629', 'metaDescription': ''}}, {'name': 'features', 'data': {}}, {'name': 'messages', 'data': {'edit': '\u062a\u0639\u062f\u064a\u0644', 'linkCopiedToClipboard': '\u062a\u0645 \u0646\u0633\u062e \u0627\u0644\u0631\u0627\u0628\u0637 \u0625\u0644\u0649 \u0627\u0644\u062d\u0627\u0641\u0638\u0629', 'ok': '\u062d\u0633\u0646\u064b\u0627', 'postLink': '\u0631\u0627\u0628\u0637 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629'}}, {'name': 'template', 'data': {'name': 'custom', 'localizedName': '\u0645\u062e\u0635\u0635', 'isResponsive': true, 'isAlternateRendering': false, 'isCustom': true}}, {'name': 'view', 'data': {'classic': {'name': 'classic', 'url': '?view\x3dclassic'}, 'flipcard': {'name': 'flipcard', 'url': '?view\x3dflipcard'}, 'magazine': {'name': 'magazine', 'url': '?view\x3dmagazine'}, 'mosaic': {'name': 'mosaic', 'url': '?view\x3dmosaic'}, 'sidebar': {'name': 'sidebar', 'url': '?view\x3dsidebar'}, 'snapshot': {'name': 'snapshot', 'url': '?view\x3dsnapshot'}, 'timeslide': {'name': 'timeslide', 'url': '?view\x3dtimeslide'}, 'isMobile': false, 'title': '\u0634\u0631\u062d \u0634\u0627\u0645\u0644 \u0644\u0640 git merge \u0645\u0639 \u0623\u0645\u062b\u0644\u0629 \u062a\u0648\u0636\u064a\u062d\u064a\u0629', 'description': '', 'featuredImage': 'https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjBKC6j6-Qoc6S3JnwnibfOSl9sqlI58KtXWD2t77ponA20QzIijeuagYO-z384ZRSf1o-TOHSynMVeYdcxOJMquIBfL_UmwaaC4dJj3y5b5YwxV1Z4n9zzY3RXLtQPHwlItqpM4DumHhuz12CyKzAzv2tDCHJYqysEY9yEpfHfA2y2po1jjR_cSMIAHDtM/s16000/Git%20and%20GitHub%20Tutorial%20-%20Lesson%20(18).png', 'url': 'https://blog.codershiyar.com/2023/07/comprehensive-guide-git-merge-examples.html', 'type': 'item', 'isSingleItem': true, 'isMultipleItems': false, 'isError': false, 'isPage': false, 'isPost': true, 'isHomepage': false, 'isArchive': false, 'isLabelSearch': false, 'postId': 2890934019331810803}}, {'name': 'widgets', 'data': [{'title': '\u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629', 'type': 'PageList', 'sectionId': 'pages', 'id': 'PageList1'}, {'title': '\u0645\u0648\u0627\u0642\u0639 \u0627\u0644\u062a\u0648\u0627\u0635\u0644 \u0627\u0644\u0625\u062c\u062a\u0645\u0627\u0639\u064a', 'type': 'LinkList', 'sectionId': 'top-social-L', 'id': 'LinkList3'}, {'title': '\u0643\u0627\u0628\u062a\u0646 \u0627\u0644\u0645\u0628\u0631\u0645\u062c\u064a\u0646 (\u0631\u0623\u0633 \u0627\u0644\u0635\u0641\u062d\u0629)', 'type': 'Header', 'sectionId': 'logo', 'id': 'Header1'}, {'title': '\u0623\u0647\u0645 \u0623\u0642\u0633\u0627\u0645', 'type': 'LinkList', 'sectionId': 'menu', 'id': 'LinkList22'}, {'title': '\u0631\u0633\u0627\u0626\u0644 \u0627\u0644\u0645\u062f\u0648\u0646\u0629 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u0629', 'type': 'Blog', 'sectionId': 'Tempnec', 'id': 'Blog1', 'posts': [{'id': '2890934019331810803', 'title': '\u0634\u0631\u062d \u0634\u0627\u0645\u0644 \u0644\u0640 git merge \u0645\u0639 \u0623\u0645\u062b\u0644\u0629 \u062a\u0648\u0636\u064a\u062d\u064a\u0629', 'featuredImage': 'https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEjBKC6j6-Qoc6S3JnwnibfOSl9sqlI58KtXWD2t77ponA20QzIijeuagYO-z384ZRSf1o-TOHSynMVeYdcxOJMquIBfL_UmwaaC4dJj3y5b5YwxV1Z4n9zzY3RXLtQPHwlItqpM4DumHhuz12CyKzAzv2tDCHJYqysEY9yEpfHfA2y2po1jjR_cSMIAHDtM/s16000/Git%20and%20GitHub%20Tutorial%20-%20Lesson%20(18).png', 'showInlineAds': false}], 'headerByline': {'regionName': 'header1', 'items': [{'name': 'timestamp', 'label': '\u0622\u062e\u0631 \u062a\u062d\u062f\u064a\u062b:'}]}, 'footerBylines': [{'regionName': 'footer1', 'items': [{'name': 'comments', 'label': 'comments'}, {'name': 'labels', 'label': '\u0627\u0644\u0642\u0633\u0645:'}]}], 'allBylineItems': [{'name': 'timestamp', 'label': '\u0622\u062e\u0631 \u062a\u062d\u062f\u064a\u062b:'}, {'name': 'comments', 'label': 'comments'}, {'name': 'labels', 'label': '\u0627\u0644\u0642\u0633\u0645:'}]}, {'title': '\u0623\u0639\u0644\u0627\u0646 \u0645\u0646\u062a\u0635\u0641 \u0627\u0644\u0645\u0648\u0636\u0648\u0639', 'type': 'HTML', 'sectionId': 'PostAds', 'id': 'HTML202'}, {'title': '\u0645\u064a\u0632\u0629 \u062c\u062f\u0648\u0644 \u0627\u0644\u062a\u0646\u0642\u0644', 'type': 'HTML', 'sectionId': 'AddOns', 'id': 'HTML1'}, {'title': '\u0645\u064a\u0632\u0629 \u0642\u062f \u064a\u0639\u062c\u0628\u0643 \u0627\u064a\u0636\u0627', 'type': 'HTML', 'sectionId': 'AddOns', 'id': 'HTML2'}, {'title': '\u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0627\u062a \u0627\u0644\u0634\u0627\u0626\u0639\u0629', 'type': 'PopularPosts', 'sectionId': 'sidepar', 'id': 'PopularPosts1', 'posts': [{'title': '\u0627\u0641\u0636\u0644 \u0645\u062d\u0631\u0631\u0627\u062a \u0627\u0643\u0648\u0627\u062f \u062c\u0627\u0641\u0627 \u0627\u0648\u0646\u0644\u0627\u064a\u0646 - Best online java compilers', 'id': 7123347837251562660}, {'title': '\u0623\u0647\u0645 10 \u0645\u0634\u0627\u0631\u064a\u0639 \u0628\u0627\u064a\u062b\u0648\u0646 \u0633\u062a\u062c\u0639\u0644 \u0645\u0646\u0643 \u0645\u062d\u062a\u0631\u0641\u0627 \u0644\u0639\u0627\u0645 2023', 'id': 6508696468800289159}, {'title': '\u062a\u062d\u0645\u064a\u0644 Java Development Kit (32-bit) \u0628\u0631\u0627\u0628\u0637 \u0645\u0628\u0627\u0634\u0631 \u0644\u0644\u0643\u0645\u0628\u064a\u0648\u062a\u0631', 'id': 2645737183090126616}, {'title': '\u0645\u0627 \u0647\u0648 \u0627\u0644\u0641\u0631\u0642 \u0628\u064a\u0646 HTML \u0648 HTML5 \u061f \u0643\u0644 \u0645\u0627 \u062a\u062d\u062a\u0627\u062c \u0644\u0645\u0639\u0631\u0641\u062a\u0647.', 'id': 982204653863216302}, {'title': '\u062a\u0639\u0631\u0641 \u0639\u0644\u0649 \u0645\u0632\u0627\u064a\u0627 \u0648\u0639\u064a\u0648\u0628 \u0627\u0644\u0648\u064a\u0628 3 \u0627\u0644\u0622\u0646\u061f', 'id': 8637471880313851816}]}, {'title': '\u062a\u0646\u0648\u064a\u0647', 'type': 'Text', 'sectionId': 'sidepar', 'id': 'Text1'}]}]); _WidgetManager._RegisterWidget('_PageListView', new _WidgetInfo('PageList1', 'pages', document.getElementById('PageList1'), {'title': '\u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629', 'links': [{'isCurrentPage': false, 'href': 'https://blog.codershiyar.com', 'title': '\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629'}, {'isCurrentPage': false, 'href': 'https://codershiyar.com', 'title': 'Coder Shiyar'}, {'isCurrentPage': false, 'href': 'https://academy.codershiyar.com', 'title': '\u0623\u0643\u0627\u062f\u064a\u0645\u064a\u0629 \u0634\u064a\u0627\u0631'}, {'isCurrentPage': false, 'href': 'http://shiyarjemo.com/app', 'title': '\u0627\u0641\u0636\u0644 \u062a\u0637\u0628\u064a\u0642\u0627\u062a - \u0647\u062f\u0627\u064a\u0627'}, {'isCurrentPage': false, 'href': 'https://www.youtube.com/playlist?list\x3dPLMTdZ61eBnyoElHxsyWjh7I_pcb1WonNZ', 'title': '\u062a\u0639\u0644\u0645 \u0627\u0644\u0628\u0631\u0645\u062c\u0629 - \u0641\u064a \u0641\u064a\u062f\u064a\u0648 1'}, {'isCurrentPage': false, 'href': 'https://www.youtube.com/c/CoderShiyar/playlists', 'title': '\u062a\u0639\u0644\u0645 \u0627\u0644\u0628\u0631\u0645\u062c\u0629 - \u062f\u0648\u0631\u0627\u062a \u0643\u0627\u0645\u0644\u0629'}], 'mobile': false, 'showPlaceholder': true, 'hasCurrentPage': false}, 'displayModeFull')); _WidgetManager._RegisterWidget('_LinkListView', new _WidgetInfo('LinkList3', 'top-social-L', document.getElementById('LinkList3'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_HeaderView', new _WidgetInfo('Header1', 'logo', document.getElementById('Header1'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_LinkListView', new _WidgetInfo('LinkList22', 'menu', document.getElementById('LinkList22'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_BlogView', new _WidgetInfo('Blog1', 'Tempnec', document.getElementById('Blog1'), {'cmtInteractionsEnabled': false, 'lightboxEnabled': true, 'lightboxModuleUrl': 'https://www.blogger.com/static/v1/jsbin/3977857781-lbx__ar.js', 'lightboxCssUrl': 'https://www.blogger.com/static/v1/v-css/1964470060-lightbox_bundle_rtl.css'}, 'displayModeFull')); _WidgetManager._RegisterWidget('_HTMLView', new _WidgetInfo('HTML202', 'PostAds', document.getElementById('HTML202'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_HTMLView', new _WidgetInfo('HTML1', 'AddOns', document.getElementById('HTML1'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_HTMLView', new _WidgetInfo('HTML2', 'AddOns', document.getElementById('HTML2'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_PopularPostsView', new _WidgetInfo('PopularPosts1', 'sidepar', document.getElementById('PopularPosts1'), {}, 'displayModeFull')); _WidgetManager._RegisterWidget('_TextView', new _WidgetInfo('Text1', 'sidepar', document.getElementById('Text1'), {}, 'displayModeFull'));