+ [2017-04-06T01:25:31Z] lemonlake distributed, secure, revert to anything any time
+ [2017-04-06T01:25:39Z] lemonlake merge conflict resolution, multiple users
+ [2017-04-06T01:25:42Z] lemonlake the glory of git :)
+ [2017-04-06T01:26:14Z] ThePortWhisperer im only doing this to help evolve my notes and notetaking

message no. 167361

Posted by lemonlake in #github at 2017-04-06T01:25:39Z

merge conflict resolution, multiple users
+ [2017-04-12T07:40:39Z] Sircle If one has not committed his changes (work in progress), he cannot do PULL. A message appears that “please commit, else your changes will be overwritten”. Whats the solution/options?
+ [2017-04-12T08:37:59Z] guardian hello, I'm trying to update a comment in an issue and I'm getting "You can't perform that action at this time"
+ [2017-04-12T15:32:45Z] albertus1 hi. is it intended behaviour of github not to show commits on my fork as "activity" on my dashboard after I opened a Pull Request? the commits show up in the PR, but they're not listed as activity on my profile
+ [2017-04-12T15:33:20Z] sonOfRa I think they only show up if they're merged.
+ [2017-04-12T15:33:53Z] sonOfRa Or, to rephrase: Only activity on the default branch (usually master) is shown