Using this metaphor, until you send your response to the main office (“push”) you can always cancel it (“unstage” in git terms). Git commit - prepare your local instructions for the main office to be mailed Git fetch - check if there were any new instructions from the main office and get them if you use Git Extensions try doing a git fetch, then refresh the UI and you will see exactly what is happening.Ī possibly useful metaphor: imagine the remote repository as the main office of some company, and your local repo copy as a regional branch. until you do git fetch your local repo won’t “know” about the latest updates posted by other contributors, and until you do git merge the changes will not be applied to your local branch. git merge can then be used to merge those changes into your local branches. One thing that was helpful in the beginning: git fetch grabs the latest updates from github (or wherever the remote repository lives) to your local copy. i still prefer to do commits via the UI, i like to double check everything before committing (and to make sure all the print("wtf") have been removed…) and i like how it shows diffs. try using git commands wherever possible and use a UI to visually confirm what effect that command had - this really speeds up understanding. having a visual tree representation really helped figuring out what some of the commands do and, surprisingly, encouraged me to use command-line tools more often. I use - it’s a windows UI (but can run on other platforms via mono). It reminds me a bit of the teletype cheatsheet. It may not be as up to date, but I really like this little chrome extension. and other ways of not interactively checking what you are staging with git add and staging stuff all at once for commit has ended up biting me and causing a lot of the wonky state stuff infovore is talking about). I have to do GPG verification of commits for another project I work on, and this breaks vs code’s commit feature in the GUI pane, probably most other GUIs too.Īlso random thought for people who are new to git: git add. edit: Still use command-line for all the other stuff. It’s a bet more featured than git add -p (though that is still a great little tool). I have been exploring the switch from atom to vs code this past week, and I do have to say I like the integrated diff pane and using it as interactive git adding. That being said, my initial exposure to Git GUI stuff was the Eclipse IDE plugins in school. This is especially true once you start getting into heavy branch/merge/rebase territory, in my opinion the first time you discover that you are (not currently on any branch), for instance, is an existential crisis that fails most GUIs’ abstractions. And yet: whenever anything unusual has happened, or I’ve needed to work out what the hell is going on, or I need functionality they hide (GitHub Desktop has no stash !), these UIs fail me a little.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |