So you were wanting to merge just your work and leave the other stuff to be merged later? That would be a nice feature - cherry-pick kinda does this but IIRC it can complicate merges later..
Now you can see why it's nice when a committer merges things right away so they can deal with their own code. Chris ________________________________ From: Phillip Carter <phillcarte...@gmail.com> Sent: July 20, 2019 12:02 AM To: linuxcnc-developers <emc-developers@lists.sourceforge.net> Subject: Re: [Emc-developers] Git lost Sorry, I don’t want to actually do this. I was just asking the question because I saw all those commits and I wasn’t sure what to do. I really don’t want to break anything... > On 20 Jul 2019, at 9:55 am, Chris Morley <chrisinnana...@hotmail.com> wrote: > > I too haven't done this exact thing - i have had completely different changes > go into release vrs master, so there was a conflict and I could pick the > right code - big pain. > But look at this, I think it covers your use case: > https://stackoverflow.com/questions/727994/git-skipping-specific-commits-when-merging > > Chris > > ________________________________ > From: Phillip Carter <phillcarte...@gmail.com> > Sent: July 19, 2019 11:33 PM > To: linuxcnc-developers <emc-developers@lists.sourceforge.net> > Subject: Re: [Emc-developers] Git lost > > > >> On 20 Jul 2019, at 12:13 am, andy pugh <bodge...@gmail.com> wrote: >> >> On Fri, 19 Jul 2019 at 10:54, Phillip Carter <phillcarte...@gmail.com> >> wrote: >> >>> Oops, yes, after Tested should be Switched to master >> >> >> OK, so you are about to merge some changes that are in 2.8, not in master, >> and were not made by you. >> > > Correct > >> I think that is probably OK. The norm in LinuxCNC is to put changes in the >> earliest branch they apply to, and then merge them up. The other things you >> see probably do belong in master, and were just sat there waiting for a >> merge. >> > > OK, thanks > >> Is there anything in the list of commits that looks particularly wrong? >> > > Not really but I wasn’t really sure of procedure and I don’t want to do the > wrong thing… > > What happens in the case that something was meant for 2.8 but not for master, > how is that prevented from being merged up in the future? > >> -- >> atp >> "A motorcycle is a bicycle with a pandemonium attachment and is designed >> for the especial use of mechanical geniuses, daredevils and lunatics." >> — George Fitch, Atlanta Constitution Newspaper, 1916 >> >> _______________________________________________ >> Emc-developers mailing list >> Emc-developers@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers > > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
