Geek asks and answers

What is the correct Git p4 workflow?

I installed the git repository using the following instructions: https://git.help.collab.net/entries/22564277-Migration-from-Perforce-to-GIT

I have a leading branch in which I get the latest information about myself and where I can make my changes to perforce. I also have a branch of development where I do my work, sometimes I will have a branch of signs (branched from development).

I tried to figure out the right workflow, this is where I am now - please correct me if there is a better way.

1) git check wizard

2) git p4 rebase (get the latest info from perforce, should I use "git p4 sync" instead?)

3) git checkout development

3) git master merge (update development to the latest version)

4) git commit .. (do all my work and commit)

5) git validation wizard (get ready to combine development with a branch

6) git p4 sync (pull the latest out of perforce)

7) git merge development

8) resolve any conflicts

9) git p4 rebase (pull the latest out of perforce, then reinstall my patched changes on top of it)

10) git p4 submit

Should git p4 rebase be used only before git p4 commit? Also for my model / workflow merging better than reloading?

+3
source share
1 answer

From http://owenou.com/2011/03/23/git-up-perforce-with-git-p4.html :

Teams

Four things to keep in mind when using git-p4:

Instead of using "git push" to push local commits to remote repository, use "git-p4 submit"
Instead of using "git fetch" to fetch changes from remote repository to local, use "git-p4 sync"
Instead of using "git pull" to fetch and merge changes from remote repository to local, use "git-p4 rebase"
Instead of using "git merge" to merge local branches, use "git rebase"

, "git merge" Git . , git. "git rebase".

+1

More articles:


All Articles