SunnyRaj · February 6, 2017 12:16
diff --git a/track_remote_and_merge.sh b/track_remote_and_merge.sh
 # This will track all remote branches
 for remote in `git branch -r | grep -v /HEAD`; do git checkout --track $remote ; done
 git checkout <your_branch>
 git merge <branch_you_want_to_merge_into_yours>
 # If you want to automatically select their version on conflict
 # git merge --strategy-option theirs <branch_you_want_to_merge_into_yours>
	# This will track all remote branches
	for remote in `git branch -r \| grep -v /HEAD`; do git checkout --track $remote ; done
	git checkout <your_branch>
	git merge <branch_you_want_to_merge_into_yours>
	# If you want to automatically select their version on conflict
	# git merge --strategy-option theirs <branch_you_want_to_merge_into_yours>