Open elihwyma opened 2 years ago
@elihwyma , @mildtoss : isn't this change already in master? https://github.com/coolstar/Odyssey-bootstrap/blob/master/procursus-deploy-linux-macos.sh#L82
master
If so, shouldn't this show conflicts and/or appear as "merged" if it was indeed merged?
@manrand yep it is, it was added by @deontw (see: https://github.com/coolstar/Odyssey-bootstrap/commit/3bfe38a3616d508cf12a2cb7de46edf601da8118)
@elihwyma , @mildtoss : isn't this change already in
master
? https://github.com/coolstar/Odyssey-bootstrap/blob/master/procursus-deploy-linux-macos.sh#L82If so, shouldn't this show conflicts and/or appear as "merged" if it was indeed merged?