Skip to main content
The 2024 Developer Survey results are live! See the results

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

2
  • 8
    Side note: you may find it useful to git fetch upstream first, then take a quick look at git diff upstream/branch to see what you will be merging in. If all is well, then proceed with git merge upstream/branch
    – Shahbaz
    Commented Oct 17, 2013 at 15:51
  • 6
    You will lose all your street cred and be docked a week's pay if any hipster brogrammer sees you do git commands from a GUI, but both GitHub Desktop and Atom have safe, straightforward buttons to undo commits and checkboxes to easily and clearly stage and unstage files. GUIs are people too! Commented Jun 15, 2019 at 6:25