Add : How To Merge and Resolve Conflicts

Sumonta056 · Aug 17, 2023 · 6ccac46 · 6ccac46
1 parent c855eb0
commit 6ccac46
Show file tree

Hide file tree

Showing 7 changed files with 212 additions and 8 deletions.
diff --git a/Images/m3.png b/Images/m3.png
diff --git a/Images/m4.jpeg b/Images/m4.jpeg
diff --git a/Images/m5.png b/Images/m5.png
diff --git a/Images/m6.png b/Images/m6.png
diff --git a/Images/m7.png b/Images/m7.png
diff --git a/TestHere.md b/TestHere.md
@@ -1,23 +1,111 @@
 
 
-### Tips - 21
-
-<h2><span style="color:#7A316F;font-weight:700;font-size:25px">
-   How To Add Video, Audio and GIFs Files directly in README.md File
+### Tips - 23
 
+<h2><span style="color:#F6635C;font-weight:700;font-size:25px">
+   🎅 How to Resolving Merge Conflicts ?
 </span></h2>
 
-#### 🎥 Add Videos on README.md File: **([👉Click Here](https://www.geeksforgeeks.org/how-to-add-videos-on-readme-md-file-in-a-github-repository/?ref=lbp))**
+#### 🎥 Tutorial Resolving Merge Conflicts (With Example): **([👉Click Here](https://youtu.be/nfOxUaA2trY))**
+
+
+
+![](Images/m5.png)
+![](Images/m6.png)
+![](Images/m7.png)
+
+
+#### 🤧 What is a Git Merge Conflict?
+A merge conflict is an event that takes place when Git is unable to automatically resolve differences in code between two commits. Git can merge the changes automatically only if the commits are on different lines or branches.
+
+The following is an example of how a Git merge conflict works:
+
+![](Images/m4.jpeg)
+
+Let’s assume there are two developers: Developer A and Developer B. Both of them pull the same code file from the remote repository and try to make various amendments in that file. After making the changes, Developer A pushes the file back to the remote repository from his local repository. Now, when Developer B tries to push that file after making the changes from his end, he is unable to do so, as the file has already been changed in the remote repository.
+
+To prevent such conflicts, developers work in separate isolated branches. The Git merge command combines separate branches and resolves any conflicting edits.
+
+#### ✍️ Step by Step Blog to Resolve Merge Conflicts : **([👉Click Here](https://www.freecodecamp.org/news/how-to-fix-merge-conflicts-in-git/))**
+
+
+![](Images/m3.png)
+#### 🍂 Some Git Commands to Resolve Merge Conflicts
+
+```code
+  👉 Format : git log --merge
+  ✍️ This command helps to produce the list of commits that are causing the conflict.
+```
+
+```code
+  👉 Format : git diff 
+  ✍️ This command helps to identify the differences between the states repositories or file
+```
 
-#### 🎶 Add Audio on README.md File: **([👉Click Here](https://www.geeksforgeeks.org/how-to-add-audio-files-on-readme-md-file-in-a-github-repository-from-the-local-system/))**
+```code
+  👉 Format : git checkout 
+  ✍️ This command is used to undo the changes made to the file, or for changing branches..
+```
 
+```code
+  👉 Format : git reset --mixed 
+  ✍️ This command is used to undo changes to the working directory and staging area
+```
 
-#### 📸 Add Images on README.md File: **([👉Click Here](https://www.geeksforgeeks.org/how-to-add-images-on-readme-md-file-in-a-github-repository-from-the-local-system/))**
+```code
+  👉 Format : git reset --mixed 
+  ✍️ This command helps in exiting the merge process and returning back to the state before the merging began.
+```
 
+```code
+  👉 Format : git reset
+  ✍️ This command is used at the time of merge conflict to reset the conflicted files to their original state.
+```
 
-#### 💃 Add GIFs  on README.md File: **([👉Click Here](https://www.geeksforgeeks.org/how-to-add-gifs-on-readme-md-file-in-a-github-repository/))**
+```code
+  👉 Format : git status
+  ✍️ This command displays the current state of the working directory and the repository. 
+  ✍️ It shows which files are modified, untracked, or staged for commit.
+```
 
 
+```code
+  👉 Format : cd documentss
+  ✍️ 'cd' is used to change the current working directory in the command line.. 
+```
+```code
+  👉 Format : cat file.txt
+  ✍️ 'cat' stands for "concatenate" and is used to display the contents of a file.. 
+```
+```code
+  👉 Format : vi example.txt
+  ✍️ 'vi' is a text editor available on Unix-like operating systems. 
+  ✍️ It allows you to create and edit files from the command line.
+```
+```code
+  👉 Format : git rebase origin master
+  ✍️ This command is used to reapply commits on top of another branch 
+  (usually master) to incorporate changes and keep a linear commit history.. 
+```
+```code
+  👉 Format : git rebase --abort
+  ✍️ This command aborts an ongoing rebase operation, 
+  reverting the repository back to its original state before the rebase. 
+```
+```code
+  👉 Format : git merge branch-name
+  ✍️ This command merges changes from one branch into another. 
+```
+```code
+  👉 Format : git mergetool
+  ✍️ This command launches a merge resolution tool
+   to help resolve conflicts during a merge or rebase. 
+```
+```code
+  👉 Format : git rebase --continue
+  ✍️ This command continues a rebase operation after 
+  resolving conflicts in the conflicted files.
+```
 
 
 <hr>
diff --git a/readme.md b/readme.md
@@ -39,6 +39,7 @@
    - **[🥩 Tips for contributing in Open Source Project ](#tips---22)**
    - **[🥶 Collaboration with Others ](#tips---22)**
     - **[🌮 How to give access permissions of your repository to other ](#tips---22)**
+- **[ 🎅 How to Resolving Merge Conflicts ?](#tips---23)**
 
 
 
@@ -722,6 +723,8 @@ There are various types of files we might want the git to ignore before committi
 
 #### 🔍 How to Find the Best Repositories for Open Source Contribution : **([👉Click Here](https://youtu.be/noKgvN_42Hk))**
 
+#### 🔍 How to Earn with Open Source Contributions : **([👉Click Here](https://youtu.be/9AkfNuc_SZ4))**
+
 
 <hr>
 
@@ -903,4 +906,117 @@ If you're ready to start making code contributions (beyond just fixing typos), h
 ###### 🎥 How to give access permissions of your repository to other **([👉Click Here](https://youtu.be/nS9QbJt4KaQ?t=380))**
 
 
+<hr>
+
+
+
+
+### Tips - 23
+
+<h2><span style="color:#F6635C;font-weight:700;font-size:25px">
+   🎅 How to Resolving Merge Conflicts ?
+</span></h2>
+
+#### 🎥 Tutorial Resolving Merge Conflicts (With Example): **([👉Click Here](https://youtu.be/nfOxUaA2trY))**
+
+
+
+![](Images/m5.png)
+![](Images/m6.png)
+![](Images/m7.png)
+
+
+#### 🤧 What is a Git Merge Conflict?
+A merge conflict is an event that takes place when Git is unable to automatically resolve differences in code between two commits. Git can merge the changes automatically only if the commits are on different lines or branches.
+
+The following is an example of how a Git merge conflict works:
+
+![](Images/m4.jpeg)
+
+Let’s assume there are two developers: Developer A and Developer B. Both of them pull the same code file from the remote repository and try to make various amendments in that file. After making the changes, Developer A pushes the file back to the remote repository from his local repository. Now, when Developer B tries to push that file after making the changes from his end, he is unable to do so, as the file has already been changed in the remote repository.
+
+To prevent such conflicts, developers work in separate isolated branches. The Git merge command combines separate branches and resolves any conflicting edits.
+
+#### ✍️ Step by Step Blog to Resolve Merge Conflicts : **([👉Click Here](https://www.freecodecamp.org/news/how-to-fix-merge-conflicts-in-git/))**
+
+
+![](Images/m3.png)
+#### 🍂 Some Git Commands to Resolve Merge Conflicts
+
+```code
+  👉 Format : git log --merge
+  ✍️ This command helps to produce the list of commits that are causing the conflict.
+```
+
+```code
+  👉 Format : git diff 
+  ✍️ This command helps to identify the differences between the states repositories or file
+```
+
+```code
+  👉 Format : git checkout 
+  ✍️ This command is used to undo the changes made to the file, or for changing branches..
+```
+
+```code
+  👉 Format : git reset --mixed 
+  ✍️ This command is used to undo changes to the working directory and staging area
+```
+
+```code
+  👉 Format : git reset --mixed 
+  ✍️ This command helps in exiting the merge process and returning back to the state before the merging began.
+```
+
+```code
+  👉 Format : git reset
+  ✍️ This command is used at the time of merge conflict to reset the conflicted files to their original state.
+```
+
+```code
+  👉 Format : git status
+  ✍️ This command displays the current state of the working directory and the repository. 
+  ✍️ It shows which files are modified, untracked, or staged for commit.
+```
+
+
+```code
+  👉 Format : cd documentss
+  ✍️ 'cd' is used to change the current working directory in the command line.. 
+```
+```code
+  👉 Format : cat file.txt
+  ✍️ 'cat' stands for "concatenate" and is used to display the contents of a file.. 
+```
+```code
+  👉 Format : vi example.txt
+  ✍️ 'vi' is a text editor available on Unix-like operating systems. 
+  ✍️ It allows you to create and edit files from the command line.
+```
+```code
+  👉 Format : git rebase origin master
+  ✍️ This command is used to reapply commits on top of another branch 
+  (usually master) to incorporate changes and keep a linear commit history.. 
+```
+```code
+  👉 Format : git rebase --abort
+  ✍️ This command aborts an ongoing rebase operation, 
+  reverting the repository back to its original state before the rebase. 
+```
+```code
+  👉 Format : git merge branch-name
+  ✍️ This command merges changes from one branch into another. 
+```
+```code
+  👉 Format : git mergetool
+  ✍️ This command launches a merge resolution tool
+   to help resolve conflicts during a merge or rebase. 
+```
+```code
+  👉 Format : git rebase --continue
+  ✍️ This command continues a rebase operation after 
+  resolving conflicts in the conflicted files.
+```
+
+
 <hr>