From: Frederick W. <fre...@go...> - 2012-02-01 14:49:07
|
Brett: So what would be the git command sequence when wanting to create a fix in a separate branch which is to be merged back to both 1.6.x and master (You could copy-paste aforementioned order as a template)? If rebasing is done before merging into 1.6.x and master, the hotfix commit will be altered (and not be the same as used in 1.6.x). Probably no big issue as 1.6.x and master will never be merged again. --Frederick |