From: | Vladimir Sitnikov <sitnikov(dot)vladimir(at)gmail(dot)com> |
---|---|
To: | Dave Cramer <pg(at)fastcrypt(dot)com> |
Cc: | List <pgsql-jdbc(at)postgresql(dot)org> |
Subject: | Re: Git branching structure: ff or no-ff |
Date: | 2015-07-20 18:35:26 |
Message-ID: | CAB=Je-EvF5tjAOCDJ_uLdw9chASsjpoK1J7TzshTNezPeVxBXg@mail.gmail.com |
Views: | Whole Thread | Raw Message | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-jdbc |
I think we'd better keep existing commits as is otherwise everybody
will have problems with on-going pull requests.
For new commits I suggest we use certain level of rebasing.
I suggest rebasing features on top of master before integration, so
the history is linear.
What do you think?
For instance: commit cddcd185 feat: Improved composite/array type support...
git checkout -b tmp cddcd185 # git fetch origin
pull/ID/head:BRANCHNAME && git checkout head:BRANCHNAME can be used
here to fetch a pull request from github
git rebase 008f6e8b2f8d # use rebase -i to squash commits as required.
008f6e8b2f8d was origin/master before cddcd185 merged in
git checkout master
git merge --ff-only tmp
git branch -D tmp # remove branch
Vladimir
From | Date | Subject | |
---|---|---|---|
Next Message | Markus KARG | 2015-07-20 20:16:58 | Re: Git branching structure: ff or no-ff |
Previous Message | Markus KARG | 2015-07-20 16:55:25 | Re: Git branching structure: ff or no-ff |