According to [1], there are 3 options:
1. Merge all commits
2. Squash the commits
3. Rebase the commits individually
1. is Chetan's 'git merge --no-ff feature'.
2. is my suggestion for 'fix-up' commits, with an added merge commit
3. is Chetan's 'git cherry-pick feature' if there is a single comm
Does this mean I need to type the commands instead of using githubs UI?
Robert Munteanu wrote
> On Wed, 2017-11-01 at 10:34 +0530, Chetan Mehrotra wrote:
>> For external contributors it would be good if commit retains the
>> original author info. So I was thinking to follow approach mentioned
>>
On Wed, 2017-11-01 at 10:34 +0530, Chetan Mehrotra wrote:
> For external contributors it would be good if commit retains the
> original author info. So I was thinking to follow approach mentioned
> in [1]. In brief use
>
> - `git merge --no-ff feature` for feature branches involving multiple
> com
Hi Chetan,
On Wed, Nov 1, 2017 at 6:04 AM, Chetan Mehrotra
wrote:
> ...In brief use
> - `git merge --no-ff feature` for feature branches involving multiple commits
> - `git cherry-pick feature` for simple bug fixes
>
> Used this for SLING-7223
I like this, the commit at [1] says "mreutegg co
Hi Team,
Given the switch to git I am now bit in dilemma on how to handle the
PR merge. With svn it was always done by applying the patch and
committing it. Keeps history fine. With Git there is choice to 'merge'
or rebase.
For external contributors it would be good if commit retains the
original
