Copy link to clipboard
Copied
I've been a long-time Dreamweaver user and I've always used the synchronize function, but I've never really used versioning control for websites (I've used them for apps and such).
I work on websites with my work computer and my home computer.
I've never had an issue keeping everything in check, using sync, but I'm getting a lot of conflicts, using sync and git.
Here is an example of my workflow...
Get to work
Synchronize (get things updates from home the previous night)
Git Fetch
Git Pull
Work on stuff
Synchronize as I'm needing to test
Git Commit as I want to capture an eventful change
Git Push
Before I leave work, I'll do one final sync and git
Get home
Recycle the same process
If I Git Fetch/Pull first, Synchronize warns of conflicts and wants me to push what Git just pulled.
If I Synchronize first, Git automatically puts the changed files in a Commit.
Git Fetch shows that Pull needs to occur.
If I Pull, it gives an error...
Error: error: Your local changes to the following files would be overwritten by merge:
{ whatever files have changed }
Please commit your changes or stash them before you merge.
Aborting
If I Commit the changes, now I have a Pull and a Push that needs to be done.
If I Pull those changes, it merges, but now I have 2 Pushes.
Those Pushes are successful and Sync shows everything is current.
That just seems like a very awkward way of working.
I thought this was all supposed to make things better.
Is there a better workflow that I should be using?
JJ
Have something to add?