Re: [2/2] maven git commit: Merge branch 'MNG-5629'

if we do merge commits then git log --first-parent will give you the same simple history *and* let you look at the development history... of course then we have to do merge commits... (which is a different story) And squashing only works if the commits you want to merge are from a single

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

there is always merge --squash. Makes the master history dead simple on the theory that no one cares about the dev history of a feature branch. On Mon, Jan 16, 2017 at 1:24 AM, Christian Schulte wrote: > Am 16.01.2017 um 10:21 schrieb Stephen Connolly: >> or if you want less

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Am 16.01.2017 um 10:21 schrieb Stephen Connolly: > or if you want less commands > > git checkout BRANCH > git pull --rebase origin master > git push origin BRANCH:master > git push origin :BRANCH > > but personally I prefer to separate the fetch from the rebase as you have > at least more of a

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

My preference matches yours for the exact same reason. You're trying to rebase or merge something you don't understand, otherwise. Blind. 10/10 :-) On Mon, Jan 16, 2017 at 10:21 PM, Stephen Connolly < stephen.alan.conno...@gmail.com> wrote: > or if you want less commands > > git checkout BRANCH

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

or if you want less commands git checkout BRANCH git pull --rebase origin master git push origin BRANCH:master git push origin :BRANCH but personally I prefer to separate the fetch from the rebase as you have at least more of a feeling of control (e.g. you can check the git log origin/master

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

We've already reviewed the branch and done a CI build with the full integration tests before we get to the merging point. On 16 January 2017 at 09:18, Fred Cooke wrote: > Perfect, if reviews aren't part of the deal. <3 > > On Mon, Jan 16, 2017 at 10:11 PM, Stephen Connolly

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Perfect, if reviews aren't part of the deal. <3 On Mon, Jan 16, 2017 at 10:11 PM, Stephen Connolly < stephen.alan.conno...@gmail.com> wrote: > I do not thing we want an overly heavy process. > > For the 3.5.0 release I suggest we try the following. Rebase so that it is > a fast-forward merge > >

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

I do not thing we want an overly heavy process. For the 3.5.0 release I suggest we try the following. Rebase so that it is a fast-forward merge git checkout BRANCH git fetch origin git rebase origin/master git push origin BRANCH:master if that git push fails, fetch rebase push once your push

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Squashing is for commits that were not done properly in the first place, either by choice WIP style, or by incompetence. I'd be heart broken if you squashed my carefully crafted atomic and standalone commits. :-p With-lease is new to me, but it's what I manually do anyway. If I see the from hash

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Am 16.01.2017 um 09:00 schrieb Fred Cooke: > No, not correct in my books. > > git checkout BRANCH # Assuming it's local already > git fetch upstream # risk free, unlike pull! > git rebase upstream/master # diff difftool merge mergetool settings are > useful, prompt = false and specify your diff

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

I have no strong opinion. There is the magical 'git log --first-parent' and 'git blame --first-parent' if you just want to see each change on master (or whatever branch you are on) That can be nicer if you have lots of PRs which have not been squashed/rebased Given the way git works as the ASF,

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Well: 1. one should never 'git push --force' rather 'git push --force-with-lease' (which is not perfect, but just better) 2. Its all moot as 'master' is protected and will refuse an actual force push On Mon 16 Jan 2017 at 08:00, Fred Cooke wrote: > No, not correct in my

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

No, not correct in my books. git checkout BRANCH # Assuming it's local already git fetch upstream # risk free, unlike pull! git rebase upstream/master # diff difftool merge mergetool settings are useful, prompt = false and specify your diff tool in advance git push --force upstream BRANCH # After

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Am 16.01.2017 um 08:27 schrieb Fred Cooke: > Rebase is the only clean way forward for small projects in which people > step on each others toes. > > Merge commits are difficult to comprehend for some developers, leading to > errors. Avoiding them is beneficial. > > On Mon, Jan 16, 2017 at 8:23

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

Rebase is the only clean way forward for small projects in which people step on each others toes. Merge commits are difficult to comprehend for some developers, leading to errors. Avoiding them is beneficial. On Mon, Jan 16, 2017 at 8:23 PM, Hervé BOUTEMY wrote: > do we

Re: [2/2] maven git commit: Merge branch 'MNG-5629'

do we want to keep such merge commits? I would have expected that when merging, we rebase then have no such merge commit: that branch work is just a temporary situation that completely disappears once merged (and we must not forget to delete merged branch) what do others think? Regards,