gnostr_asyncgit::sync::branch::merge_commit

Function merge_upstream_commit

Source 
pub fn merge_upstream_commit(
    repo_path: &RepoPath,
    branch_name: &str,
) -> Result<Option<CommitId>>
Expand description

merge upstream using a merge commit if we did not create conflicts. if we did not create conflicts we create a merge commit and return the commit id. Otherwise we return None