[Freeipa-devel] Questions on git

[Florence Blanc-Renaud]

Hi all,

as I am ramping up with git, I have a few questions. Let's imagine the 
following development workflow:

- I start working on a specific issue and decide to create a branch on 
my git repository (on my laptop)
git clone git://git.fedorahosted.org/git/freeipa.git
git branch -b issue
- When my code looks ok, I decide to commit on the branch (still on my 
ldaptop)
git add <file>
git commit

- Now I would like to push this on my development VM (I already cloned 
the repos on the VM). What would be the right command to push only the 
branch "issue" to my VM repo? Does the following command push only the 
current branch?
git push --repo=ssh://frenaud@<VM IP@>:/path/to/src/freeipa

- When the tests are ok and I want to submit a patch, can I stay on the 
branch "issue" to create the patch or should I merge first with the main 
branch? If a merge is required, is it recommended to pull then merge or 
merge then pull?

Thanks for your tips,
Flo.

-- 
Florence Blanc-Renaud
Identity Management Team, Red Hat

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20160523/040c779f/attachment.htm>