picod·il y a 7 ans·discussmerge- when commits of both branch need to preserve- when additional zero file “merged commit” is ok- when chronology order of commits need to maintainrebase- when commit of both need to preserve- when zero file “merged commit” is not desired- when rebased branch commits need to stay on top of other branch- when change of commit id is ok
picod·il y a 7 ans·discusscool, if this is reliable enough to be part of CI process it will be super useful
picod·il y a 7 ans·discussmy 110 loc implementation https://github.com/ldarren/pico-common/blob/master/src/plugi...you can try it here http://json.jasaws.com/
- when commits of both branch need to preserve
- when additional zero file “merged commit” is ok
- when chronology order of commits need to maintain
rebase
- when commit of both need to preserve
- when zero file “merged commit” is not desired
- when rebased branch commits need to stay on top of other branch
- when change of commit id is ok