i have project on github. locally using perforce , git p4 push commits github. merged pull request cannot life of me figure out how merge git repo perforce workspace. grab files git repo , move them hand workspace, truthfully project small , wouldn't issue, if i'm working on larger project i'd know how better.
my git repo go merge, after trying git p4 sync, submit, , commit, nothing moving files repo workspace. git p4 rebase seems go workspace repo, not other way around.
does know proper workflow this?
you must rebase github repo have linear history (using git rebase, not git p4 rebase) before can copy commits perforce workspace.
from git-p4 documentation (emphasis mine):
troubleshooting merge conflicts during submission
git history might contain merge. git-p4 cannot copy merge commits perforce. must rebase or rewrite git history linear before git-p4 can copy perforce.
and little further down on page:
git-p4 cannot copy branched or merged git history perforce. when [a feature] complete, add feature master branch not merging, recreating branch commits on top of the master branch... details, read "git rebase".
if branches cannot rebased single linear history, delete them history.
Comments
Post a Comment