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 session, I commit the code on my desktop, do a git
push to the repo.
When I look at the server, the code there is identical to what's on my
desktop box and what I just comitted and pushed, but, of course, git
status thinks it's all modified and wants me to either commit it or
stash it. In fact, doing a git log on the server doesn't show my latest
push. So I need to pull the changes, but I can't because I have pending
stuff.
What's a good git workflow for this save-upload-remote test cycle?
Thanks,
--
Ed Greenberg
Glens Falls, NY USA
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html