You can either setup a merge tool ahead of time or be like me and wait until your first conflict from the command line. Git does an amazing job with merging but merge conflicts are inevitable. Quickly I remembered the Linux file system is case sensitive and it also made me realize this solution had line ending inconsistency issues.Ĭonfiguring Git Configuring the Merge Tool Linux Bash Shell on Windows 10 – I installed this more out of curiosity to experiment with later on.Visual Studio Code PowerShell Extension – Similar to the previous install but for Visual Studio Code since Visual Studio locks up on me enough already and Code is so lightweight.PowerShell Tools for Visual Studio – Occasionally I’d edit Git related PowerShell files in Visual Studio and run from there.posh-git – Once I started using Git from PowerShell more, I found posh-git’s status indicators and tab completion to be very handy.It’s great for scripting out app installs for machine rebuilds among other things. Chocolatey – I decided to install posh-git via Chocolatey so I installed this first.In some cases it felt like form over fashion, and sometimes the animated loading indicator would never go away. GitKraken – Source Tree frustrations lead me to this GUI client.DiffMerge – I’ve used this app for years so I installed it to set it up as the merge tool for Source Tree. 2.x is better but can still take some 20+ seconds to load for me. SourceTree – After noticing some issues using Visual Studio Team Explorer with git, I started using Source Tree with our Bitbucket project.Git command line tools – I started with the basics.I’m not a Bash guy but I’ve got nothing against it :). However, most everything will apply to other shells though some parts will have specific differences depending on the shell, OS, the version of Git, Git and machine configuration, etc. What Command Line Shells? This series will mostly focus on PowerShell-based shells since this project was Windows-based and given my familiarity with PowerShell. There’s actually a newer Git Data Transport Commands Diagram from Stephen Marron that I like better, as it includes additional commands and concepts like stashing. I think it’s handy to reference this Git data transport commands diagram from Oliver Steele before and during use of the corresponding commands to help visualize the concepts. At the end of each sprint, the integrated, accepted code in develop is merged into master. Once a PR is approved, the feature branch is merged back into develop. Pull requests are created for code reviews when features are dev complete. Story and bug fix feature branches are created off a develop branch which serves as the integration point. The Git workflow for this particular project is basically the Continuous delivery workflows with the branch-per-issue model. If you’re not familiar with basic Git or DVCS concepts, you might start with some Git basics or a presentation like Git Demystified by Jimmy Bogard. Git Concepts Basic Concepts This series is aimed more towards the casual Git user who mostly uses a GUI and wants to do more from the command line. This post series documents some of my learning / re-learning of Git basics and my transition to doing most of my Git work with the command line. Git can feel overwhelming at times, especially from the command line – there are so many commands, often with an insane number of switches, for many different scenarios, and sometimes with many different ways of accomplishing the same thing. I started off more with Git GUI clients but pretty quickly both bugs and slow and clunky UI’s lead me to trying more and more with the command line. My current project is the first where I’ve used Git heavily in a team environment where I really needed to learn it more. I was mostly using Git GUI apps with occasional command line use for simple basics. I’ve used Git but it’s mostly been for small, personal projects where I was the only developer, happily coding away in keyboard cowboy fashion in the master branch with nary a care in the world. In recent years I’ve had the misfortune of mostly working with TFS source control at work.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |