Re: Problem with two copies of same branch diverging

2016-08-04 Thread Junio C Hamano
On Thu, Aug 4, 2016 at 10:50 AM, Ed Greenberg wrote: > On 08/04/2016 01:28 PM, Junio C Hamano wrote: >> >> ... indicates that you are not pushing to update the remote >> repository correctly. Once you get that part working correctly, >> after you push at the end of the session, you should be able

Re: Problem with two copies of same branch diverging

2016-08-04 Thread Junio C Hamano
Ed Greenberg writes: > Hi, Thanks for reading my question. > > I have two copies of code checked out at the same branch. Desktop and > remote server. > > I use an IDE that automatically SFTP transfers each save from the > desktop to the remote server, so I can run my changes on the server > envir

Problem with two copies of same branch diverging

2016-08-04 Thread Ed Greenberg
Hi, Thanks for reading my question. I have two copies of code checked out at the same branch. Desktop and remote server. I use an IDE that automatically SFTP transfers each save from the desktop to the remote server, so I can run my changes on the server environment. At the end of the sess