Windows Github basics and conflict handling (like VSS)

Question

I'm new to Git / GitHub (used VSS in past). Based on my SO Post I'm using Windows GitHub Its user friendly compared to the command prompt based Git bash stuff. In particular the sync feature, no worries about SSH, etc...

I'm trying to understand the flow in terms of VSS (atleast basic check in /out & rollback). My understanding -

1. Initially, clone a remote repository locally (probably like checkout the whole proj in VSS but in Git its a separate clone copy)
2. Later I just need to Pull (like get latest in VSS). Make changes, commit (all done on local cloned branch) - like staging checkins
3. Finally, Push the commit(staged changes) on the remote repository (like final checkin as in VSS).

Can the tool detect / handle conflicts? I found an excellent SO Post but need to confirm. I believe I'll get a conflict message while Push. Then I'll have to manually alter the file (merge changes) and then Push it again (like we do merge in VSS). Do I've to use commandline or is it possible from within the tool?

And how can I rollback to a prev version - from Git bash or tool?

---

I also found some VS.Net source control providers and extensions but some got me back to the old SSH and other complex things. I want to keep it simple and make it least complex to encourage my team .. if you know what I mean. VSS was no pain to use or learn :-)

Ref

• Good Win Github article
• Cool guide for git concepts
• Git Tools

Answer 1

Can the tool detect / handle conflicts?

Yes, but the command line is still recommended: more details in "On conflict, GitHub for Windows puts me in “rebasing” state, how to go from there?"

can I rollback to a prev version - from Git bash or tool?

GitHub for Windows offers different options (rollback, revert, discard), and you even can undo those operations now.