git resolve conflicts with commit changes to the source branch code example

Example 1: how to resolve conflict in git

This is very question because I am facing
with this issue all the time. Basically
conflict arises when more than one commit 
that has to be merged with some change in the
same place or same line of code. In this case
git will not be able to predict which change
to take. So my approach to fix this issue, 
I would stash my project to temporary memory 
and pull the project from github to working 
directory. I would fix the confict and
merge the project and than I would add,
commit and push it the updated version.


git stash        -- > take my project to temp memory
git pull         -- > pull the project from GitHub to working directory
						(my computer)
git stash pop    -- > take my project to my working directory,     
					fix the conflict and merge the project.
git add .
git commit –m “comment”
git push

Example 2: Automatic merge failed; fix conflicts and then commit the result.

# Step 1:  
# Navigate into the local Git repository that has the merge conflict.

cd REPOSITORY-NAME

# Step 2: 
# Generate a list of the files affected by the merge conflict. 
# In this example, the file styleguide.md has a merge conflict.

git status

> # On branch branch-b
> # You have unmerged paths.
> #   (fix conflicts and run "git commit")
> #
> # Unmerged paths:
> #   (use "git add ..." to mark resolution)
> #
> # both modified:      styleguide.md
> #
> no changes added to commit (use "git add" and/or "git commit -a")

# Step 3: 
# Open your favorite text editor, such as Atom, and 
# navigate to the file that has merge conflicts.
# To see the beginning of the merge conflict in your file, 
# search the file for the conflict marker <<<<<<<. 
# When you open the file in your text editor, 
# you'll see the changes from the HEAD or base branch 
# after the line <<<<<<< HEAD. Next, you'll see =======, 
# which divides your changes from the changes in the other branch, 
# followed by >>>>>>> BRANCH-NAME. 
# In this example, one person wrote "open an issue" in the base or HEAD 
# branch and another person wrote "ask your question in IRC" in the 
# compare branch or branch-a.

If you have questions, please
<<<<<<< HEAD
open an issue
=======
ask your question in IRC.
>>>>>>> branch-a

# Step 4:
# Decide if you want to keep only your branch's changes, 
# keep only the other branch's changes, or make a brand new change, 
# which may incorporate changes from both branches. 
# Delete the conflict markers <<<<<<<, =======, >>>>>>> and 
# make the changes you want in the final merge. 

# In this example, both changes are incorporated into the final merge:

If you have questions, please open an issue or 
ask in our IRC channel if it's more urgent.

# Step 5:
# Add or stage your changes.

git add .

# Step 6:
# Commit your changes with a comment.

git commit -m "Resolved merge conflict by incorporating both suggestions."