Closed vmx closed 5 years ago
@daviddias Sure. Just out of curiosity: Why are all directories now screaming all uppercase? I personally find lowercase easier to read and navigate on a terminal.
@daviddias I don't have push access.
@daviddias You wouldn't need to do a rename (you still have a conflict). You would just cherry pick the original commit on top of master and then do a force push.
@vmx can you resolve the merge conflicts?