Breaking News: Grepper is joining You.com. Read the official announcement!

git merge two files

Charles-Alexandre Roy answered on July 29, 2022 Popularity 5/10 Helpfulness 6/10

answer git merge two files

git merge two files

Comment

# Basic syntax:
git merge-file -p current_version common_ancestor other_version > merged_version
# Where this places the results in the merged version file
# Note:
#	- if you don't have a common ancestor, you can use an empty file instead
#	- any merge conflicts need to be dealt with in the merged version
#	- if you want to directly add the other_version content to the current
#		version, use:
#		git merge-file current_version common_ancestor other_version

Popularity 5/10 Helpfulness 6/10 Language shell

Source: stackoverflow.com

Tags: git-merge shell

Link to this answer
Share Copy Link