+ [8 years ago] Peppernrino even better: how do i use a different branch?
+ [8 years ago] lemonlake it'll contain the sections froma ll the conflicting branches, you just choose a section from each
+ [8 years ago] lemonlake and then git commit and git push
+ [8 years ago] Peppernrino i keep cloning, and it always clones the master branch
+ [8 years ago] sparr why doesn't github detect that this PR was merged? should the merger be doing something different at the command line to make github recognize it? does it have to be merged in the web interface? https://github.com/andymeneely/squib/pull/208#issuecomment-285902425

message no. 165347

Posted by Peppernrino in #github at 2017-03-11T20:39:38Z

i keep cloning, and it always clones the master branch
+ [8 years ago] lorenzo what's the practical difference of using git lfs?
+ [8 years ago] lorenzo I mean if I have some large assets (e.g. .psd, .jpg) and push them on a repo with lfs enabled
+ [8 years ago] lorenzo when I clone the repo back, do I get those assets back or just the S3 urls?
+ [8 years ago] elnuno lorenzo: ISTM it'll download (and upload) the assets when/if you need it. And if you don't need to tinker with them (say, a quick clone to show code to someone) you can skip downloading them