The branch that I've been maintaining since you took over lead dev on s2Clean, is the jaswsinc branch. This branch contains all of the latest changes that I'm aware of, and it contains the original dev branch before you reformatted some of the files. I'm not sure how to move forward exactly. Do we merge jaswsinc into the dev branch that you're maintaining, or what do you think will be easier?
@brucewsinc writes...
Let's roll back the dev branch to the commit that you forked the jaswsinc branch at, then merge it into the 000000-dev branch. I'll create a new branch for the changes I made locally, and then I'll manually pull those changes into a feature branch then merge that into the 000000-dev branch.
@jaswsinc writes...
The branch that I've been maintaining since you took over lead dev on s2Clean, is the
jaswsincbranch. This branch contains all of the latest changes that I'm aware of, and it contains the original dev branch before you reformatted some of the files. I'm not sure how to move forward exactly. Do we mergejaswsincinto the dev branch that you're maintaining, or what do you think will be easier?@brucewsinc writes...
Let's roll back the dev branch to the commit that you forked the
jaswsincbranch at, then merge it into the000000-devbranch. I'll create a new branch for the changes I made locally, and then I'll manually pull those changes into a feature branch then merge that into the000000-devbranch.