On Friday, March 8, 2013 4:06:04 PM UTC-5, Piers H wrote:
> why does git require all these gymnastics just to do a simple merge?
> with SVN it was 1 command, and I never had any issues with it. i don't
You'll need to adjust your workflow a little bit. Git has a different
philosophy from Subversion, you need to adapt mentally. It's not a great
Do your local work and commit it. Don't leave any files out of the
commit(s) if you need them. Commit everything you can.
Then, do a git pull. If this causes a merge conflict, you can solve it
like any other merge conflict, in a sane way.
No need to stash your changes.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.