lenny lennykioko

## solve_merge_conflicts.md

      
              1 file
            
          
              0 forks
            
          
                0 comments
              
            
              1 star
            
          
                lennykioko
                / solve_merge_conflicts.md
            
            
              Last active
              April 5, 2021 08:23
                — forked from RuthNjeri/solve_merge_conflicts.md
            
          
    Merge conflicts

Happens when working on a team project when two/more developers have edited the same file.

Therefore, face the conflict courageously.
Assumption: current_branch(local branch) conflicts with a base branch called base-branch
Solving a merge conflict by rebasing


git pull origin --rebase develop. If merge conflicts persist:
Fix merge conflicts by accepting either current changes, incoming changes or Accept both changes


## Dockerfile
# Last updated: 08/24/2916
#
# Total instructions available: 18
#
# https://docs.docker.com/engine/reference/builder/
#
# You can use a .dockerignore file in the same context directory as
# your Dockerfile to ignore files in the context before sending them
# to the Docker daemon for building to speed up building.
	# Last updated: 08/24/2916
	#
	# Total instructions available: 18
	#
	# https://docs.docker.com/engine/reference/builder/
	#
	# You can use a .dockerignore file in the same context directory as
	# your Dockerfile to ignore files in the context before sending them
	# to the Docker daemon for building to speed up building.