John Musiu johnmusiu

## solve_merge_conflicts.md

      
              1 file
            
          
              0 forks
            
          
                0 comments
              
            
              0 stars
            
          
                johnmusiu
                / solve_merge_conflicts.md
            
            
              Created
              November 20, 2018 08:15
                — 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 base-branch. If merge conflicts persist:
Fix merge conflicts by accepting either current changes, incoming changes or Accept both changes


## Makefile

#
# Ubuntu 16.06 LTS (Xenial Xerus)
#
# Basic packages i usually install.
#
# Author: Julius Beckmann <github@h4cc.de>
#
# Upgraded Script from 14.04: https://gist.github.com/h4cc/7be7f940325614dc59fb
#

	#
	# Ubuntu 16.06 LTS (Xenial Xerus)
	#
	# Basic packages i usually install.
	#
	# Author: Julius Beckmann <github@h4cc.de>
	#
	# Upgraded Script from 14.04: https://gist.github.com/h4cc/7be7f940325614dc59fb
	#