Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? Thanks for the info. Definitely will check it out. URL: https://forum.audiogames.net/post/571019/#p571019 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? WSL1 is ubuntu but you can't run anything that needs a daemon, cgroups, and/or a couple other things (i.e. no Docker).  I've taken it as far as running the Redis plus Postgres stack at one point if I recall, and when I did my Rust compiler

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? How does WSL compare to the original distros (Ubuntu for example)?Sorry this has gone fairly off-topic. URL: https://forum.audiogames.net/post/571003/#p571003 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? The thing about WSL is it can access your Windows files and opening bash opens it to your current Windows directory. That's why it's useful and so many of us like it. URL: https://forum.audiogames.net/post/571002/#p571002

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? @7/8Thanks for the responses. I don't anticipate this project being super heavy. I used to have WSL set up, but never really used it. I also have a very simple Linode VPS I can SSH into if I want the official Linux experience, although

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? WSL is super easy to setup and it interoperates with windows command prompt and power shell super well.I usually work just in cmd prompt, but if I need to do some stuff that is much easier to do in bash, I will drop into bash just by typing

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? @6School projects are likely not large enough for that procedure to be warranted.The Windows version of git and the Linux version of git are basically the same.  If you find yourself working in WSL, get the Linux version, otherwise Windows

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? @5 I'll keep this bookmarked. I know enough of Git to be dangerous, but nowhere near proficient to understand 95% of what you wrote. Git SCM has some pretty comprehensive documentation that I've been reading through. I don't know if it's

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? There is actually another option for complex conflicts as long as you have a good history on your branch and have made a point of separating your work into multiple atomic commits.  I'll explain this, but I hesitate to do so because

Re: Graceful way of handling Git merge conflicts?

Re: Graceful way of handling Git merge conflicts? Hello,Sighted people use tools lie git cracken, which allow you to quickly choose what to keep and what to junk.Sadly, I haven't found any tool like this accessible for us. Most of the time, I resolve conflicts manually, by looking