Sam Ruby wrote on 5/26/17 4:05 PM: > On Fri, May 26, 2017 at 2:17 PM, sebb <[email protected]> wrote: >> On 26 May 2017 at 17:02, Sam Ruby <[email protected]> wrote: >>> On Fri, May 26, 2017 at 11:34 AM, Shane Curcuru <[email protected]> >>> wrote: >>>> sebb wrote on 5/25/17 3:57 PM: >>>>> If someone else has committed since I last synchronised the workspace, >>>>> I have found that I can eliminate some commit noise as follows: >>>> >>>> Are there equivalent buttons in the GitHub Desktop app? >>> >>> I presume that what Sebb described isn't necessary on the GitHub >>> Desktop app as we haven't been seeing any 'noise' from you (read: >>> merge commits). >> >> What about the following [1] ? > > That's unavoidable. > > Squishing things you haven't pushed yet is a good idea. > > For whatever reason, Shane opted to work on a branch, and push his > branch to github. Once pushed, any changes (including merges) will be > visible to all, and will result in notifications.
If someone can show me simple ways, using the GH Desktop client, that I can make commit logs easier for everyone else, I'll try it. But I can also see the value in using visible branches sometimes, and continuing work in separate branches perhaps, especially for code that touches more than one tool. In particular, simple ways in the UI to make a local branch, and be able to make commits just locally without showing up in the repo. But still being able to sync the master if I need to switch back. I don't see any help on "squash" in the desktop help tho, sorry. -- - Shane https://www.apache.org/foundation/marks/resources
