+ [10 years ago] bret yup
+ [10 years ago] bret you can take two branches, do indipedant changes then later merge those two then PR that to the main
+ [10 years ago] bret typically you would merge one branch into the other
+ [10 years ago] bret any conflicts, git will yell at you and let you use a merge tool of your choice to figure out overlap

message no. 105959

Posted by bret in #github at 2015-07-31T23:10:56Z

typically you would merge one branch into the other
+ [10 years ago] xrogaan anybody has issue creating pull requests from the github windows client?
+ [10 years ago] rcsheets hello. can anyone confirm or correct my understanding that github doesn't support anonymous access over ssh? i.e. cloning via ssh requires an ssh key that's tied to a github account?
+ [10 years ago] VxJasonxV rcsheets: correct. SSH always requires authentication
+ [10 years ago] rcsheets VxJasonxV: thanks!!
+ [10 years ago] cascada-io hi, how can i regularly sync to github in a way that produces no visible commit history? currently, when i make changes in my local repo, i delete the github repo, recreate, and then push. looking for a less tedious approach