b39e695f387a5f9d2d411064a13d6d0cb5991c9f
Merge parents 0f8c686fd41 386b50e1093
markd
  Thu May 1 23:08:49 2025 -0700
fixed merge conflict

diff --cc src/makefile
index 4ebb6bf0be0,7543c906c35..acc26cc8272
--- src/makefile
+++ src/makefile
@@@ -57,36 -56,36 +57,36 @@@
  cgi-alpha: check-alpha libs logUser
  	cd hg && ${MAKE} alpha
  	cd utils/bedToBigBed && ${MAKE} alpha
  
  cgi-beta: check-beta libs logUser
  	cd hg && ${MAKE} beta
  	cd utils/bedToBigBed && ${MAKE} beta
  
  # This log file can be useful when debugging problems on the alpha and beta builds.
  logUser:
  ifeq (${IS_HGWDEV},yes)
  	echo ${USER}, $(MAKECMDGOALS), `date` >> ${CGI_BIN}/buildLog.txt
  endif
  
  check-alpha:
- 	# this will fail if we are not on master branch:
- 	${GIT} branch | egrep '\* master' > /dev/null
+ 	# this will fail if we are not on master or beta branch:
 -	git branch | egrep '\* master|beta' > /dev/null
++	${GIT} branch | egrep '\* master|beta' > /dev/null
  
  check-beta:
  	# this will fail if we are not in a beta checkout:
 -	git branch | egrep '\* v[0-9]+_branch' > /dev/null	
 +	${GIT} branch | egrep '\* v[0-9]+_branch' > /dev/null	
  
  BLAT_SUITE_DIRS = blat gfClient gfServer webBlat hg/pslPretty hg/pslReps \
  	hg/pslSort utils/nibFrag utils/faToNib utils/faToTwoBit utils/twoBitToFa \
  	utils/twoBitInfo isPcr blatz
  
  blatSuite: ${BLAT_SUITE_DIRS:%=%.blatSuite}
  
  %.blatSuite: topLibs hgLib
  	 ${MAKE} -C $*
  
  # all of these application makefiles have been updated to include use
  #	of DESTDIR and BINDIR
  
  # common subdirs uses by multiple targets
  STD_DIRS = ameme index dnaDust protDust weblet aladdin primeMate fuse meta tagStorm \