message no. 179737
Posted by Wes- in #github at 2020-04-23T12:57:58Z
Mornin' folks -- looking for some advice. I've forked a project on github, and my changes will /not/ make it into mainline. What is the best way for me to set up my workflow so that I can track changes from the mainline? I normally do my work on feature branches and merge back to master. Do I keep this up, and just keep merging from the mainline master, or is there a smarter way? (My changes are surgical, difficult merge confli