[git-users] git merge

2016-11-17 Thread ranjit
hi everyone, i want to pull code from the REPO to LOCAL and always edit changes before merge but when i pull updates it immediately merges them.. what is the correct command too use so that i can edit changes every time before merge?? ans also can you guys please suggest how i can turn the

Re: [git-users] git merge

2016-11-17 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 02:19:30 -0800 (PST) ran...@cnetric.com wrote: > hi everyone, i want to pull code from the REPO to LOCAL and always > edit changes before merge but when i pull updates it immediately > merges them.. what is the correct command too use so that i can edit > changes every time

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Konstantin Khomoutov
On Wed, 16 Nov 2016 14:18:10 -0800 (PST) Walt Feasel wrote: > I am having a really tough time determining which procedure I should > use to update my branches. I see conflicting advise on which is > better for situations cause of the log changes made. > > I think if I

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 11:25:17 -0500 Fleetwood Farm wrote: [...] > I believe I am understanding it better already. I will need to reread > it a few more times, and your provided links, to digest it all, but > think I can see land through the fog now. I am never going to push

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Fleetwood Farm
resent as forgot to reply-all for others On Nov 17, 2016 7:05 AM, "Konstantin Khomoutov" < flatw...@users.sourceforge.net> wrote: > > On Wed, 16 Nov 2016 14:18:10 -0800 (PST) > Walt Feasel wrote: > > > I am having a really tough time determining which procedure I should > >

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 13:56:06 -0500 Walt Feasel wrote: > On Thu, Nov 17, 2016 at 09:11:48PM +0300, Konstantin Khomoutov wrote: > > On Thu, 17 Nov 2016 11:25:17 -0500 > > Fleetwood Farm wrote: > > > > [...] > > > I believe I am understanding it better

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Walt Feasel
On Thu, Nov 17, 2016 at 09:11:48PM +0300, Konstantin Khomoutov wrote: > On Thu, 17 Nov 2016 11:25:17 -0500 > Fleetwood Farm wrote: > > [...] > > I believe I am understanding it better already. I will need to reread > > it a few more times, and your provided links, to digest

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Walt Feasel
On Thu, Nov 17, 2016 at 10:48:00PM +0300, Konstantin Khomoutov wrote: > On Thu, 17 Nov 2016 13:56:06 -0500 > Walt Feasel wrote: > > > On Thu, Nov 17, 2016 at 09:11:48PM +0300, Konstantin Khomoutov wrote: > > > On Thu, 17 Nov 2016 11:25:17 -0500 > > > Fleetwood Farm