+[2020-03-12T18:17:41Z]avuncularI /think/ the history isn't screwed up +[2020-03-12T18:17:55Z]avuncularThe network graph seems sensible +[2020-03-12T18:18:09Z]dmlloydthen you're probably fine +[2020-03-12T18:18:29Z]avuncularCool, will give that a try. Thanks @dmlloyd! +[2020-03-12T18:18:56Z]dmlloydfor future reference though, github is more intuitive with branches that are periodically rebased on upstream than with branches that are periodically merged with upstream
merges don't really have base branches; they just have more than one parent
+[2020-03-13T09:38:47Z]DK21i want to integrate this commit into my foreman installation: https://github.com/theforeman/foreman/pull/7482/commits/246fe36a03882e8ca68ae2cf3b1193017f5b8e03 how would i actually do that? +[2020-03-13T09:41:30Z]roboircyou may have to just git clone the code with that commit and use it +[2020-03-13T09:41:39Z]roboircor check this +[2020-03-13T09:41:40Z]roboirchttps://stackoverflow.com/questions/6372044/how-do-i-merge-a-specific-commit-from-one-branch-into-another-in-git +[2020-03-13T16:27:46Z]TidersHave issue templates in my repo. They were created using the github tool in settings page to generate them. They'd been working but just suddenly in the last day or 2 the body content of the template no longer gets put into new issues. The asignee and labels are still auto set but the body content is not put in. Anyone else come accross this issue?