Git sync fork

@kevgo please review
Scenario: with upstream repository, on the main branch