i know ideal process in following scenario :
- develop feature a
- feature makes apparent bug (b) part of software.
- create bugfix branch off in order fix b. without a, cant see bugfix b effective. (edit: because can see bug when there. b has been wrong, no visible symptom until branch a. branch has nothing wrong in itself)
now in pr bugfix, there branch make harder see in diff bugfix is. plus tech reviewer risks tempted review things in bugfix branch b.
so, branch in bugfix branch b feature reviewer bad tech reviewer.
i have been thing of pulling-unpulling b needed, unpulling not seems solid (maybe i'm wrong)
my question here not git syntax, more general workflow handle such case. avoid constraining reviewers git work, , show thing ready review.
do know nice workflow in such case ? (please add git commands in response if bit fancy)
i apologise beginning if i'm getting wrong, details got me confused, although read twice or thrice ("without a, cant see bugfix b effective" - how can b without a, when originated in a?)
regarding question in title: if have branch x , pull branch y in test , remove it, suggest cloning branch x x1 , merge y branch in it, can see/test how behave together. after that, branch x1 can safely deleted.
git checkout x; git checkout -b x1; git merge y; this can done in pull request better visualisation.
however, if developing feature branch a stated in first bullet there, there no need creating bugfix branch off a, until have merged branch main branch (master, or whatever called it). fixing bugs should done directly a.
my proposed solution, @ least how enjoyed working on projects far is:
- create feature branch
aoffmasterbranch - every , then, test works ok on
a, mergemasterbranch (git checkout a; git merge master;) -> ensures feature branches up-to-date master branch, , furthermore makes final pr branch more easy, less changes exist between two. - when finished developing on feature branch
a, merge via pull request
hope helpful in way
Comments
Post a Comment