All my bug fixes were a single commit. Are we really support to make a
branch for that then merge the branch and then commit for a changing in a
single file?
If I where you, I would create a branch named <JIRA_ID> for a such hudge
bugfix, do all my commits relative to this bugfix to it, even push the
branch, once all done, I whould do a git fetch and then, from the develop
branch, git merge <JIRA_ID> and push it again.
But because generaly, I guess people won't do that and will work on the main
dev branch, before to push, they should do a git pull -rebase but even,
because they will forget, it is better to instruct git to automaticly rebase
on pull (the command I gave you in the previous post)
AFAIK The git flow model doesn't say you need to make a feature branch for
a bug fixes
Yes, look at [1] and see hotfixes.
No each commit dealing with a different bug fix. Each commit (some with
single file/other with multiple) referred to a single bugfix.
It is exactly what I meant
Well I only had to do a pull because git doesn't allow you to commit
changes in a directory when there are outstanding upstream changes in
another directory.
And you should have done a git pull -rebase instead, because they will
forget to do so, it is better to instruct git to automaticly rebase on pull
(the command I gave you in the previous post)
-Fred
[1] http://nvie.com/posts/a-successful-git-branching-model/
-----Message d'origine-----
From: Justin Mclean
Sent: Tuesday, March 19, 2013 2:59 PM
To: [email protected]
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
it's not the git default because in git we're soppose to work on branches
for features and "more than one commit" bug fixes,
All my bug fixes were a single commit. Are we really support to make a
branch for that then merge the branch and then commit for a changing in a
single file? AFAIK The git flow model doesn't say you need to make a feature
branch for a bug fixes.
then merge without rebasing allows the history to keep track of this set
of changes, it creates a merge commit.
Sorry that makes no sense to me.
What you did is only do few commits as part of a bugfix
No each commit dealing with a different bug fix. Each commit (some with
single file/other with multiple) referred to a single bugfix.
, but because you wasn't working on a branch, when you did git pull
Well I only had to do a pull because git doesn't allow you to commit changes
in a directory when there are outstanding upstream changes in another
directory.
rewrite the commits history to place your commits after mine.
Doesn't that then mean that the history is now out of order?
Justin
