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/mailman/listinfo/audiogames-reflector
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 work some years ago that was the primary environment I used for it.WSL2 is Ubuntu in a VM plus magic and can run anything and everything up to and including Linux desktops, far as I know. URL: https://forum.audiogames.net/post/571004/#p571004 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 doing things completely locally would be good for testing if my network drops out. URL: https://forum.audiogames.net/post/570998/#p570998 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 "bash". I will do whatever stuff I wanted to do and then I can drop out of bash back into cmd prompt just by pressing ctrl + D.git works much better in bash than cmd prompt or even power shell because of much smarter auto completion.for example if you are typing :git add then when you press tab to auto complete, it will only give you suggestions for files that have been modified or new files that aren't in .gitignore.another example, when typing:git checkout the suggestions will include things like branch names, which is particularly useful as those can et very long. URL: https://forum.audiogames.net/post/570972/#p570972 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 is fine. URL: https://forum.audiogames.net/post/570970/#p570970 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 worth using WSL to get the Linux version of Git or not. URL: https://forum.audiogames.net/post/570961/#p570961 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 if you're new to git you can get into trouble, so back things up before playing with this stuff, and be aware that I'm discussing history rewrites. You're told history rewrites are bad, but the truth is they're bad if done wrongly, and lots of big projects (i.e. the Rust compiler) instruct you to do some of this as part of opening your PR. Anyway, you can:git checkout master git pull git checkout mybranch git rebase masterThen resolve the conflicts one by one and you can test the changes after each commit. Things like Phabricator almost force you to use this workflow. Be aware that when rebasing, conflict markers are backward.At work we go for small, atomic code reviews that you can do in a few minutes, which means the above, plus one of two ways to organize history into something that's better than git commit m-m "It's 3 am and I'm done, backing this up" sorts of commits. You can either:git rebase -i master, followed by edit (to amend a commit message or to split a commit) or fixup (to collapse a commit into a previous one). You can even reorder commits pretty easily with this approach. It works well when you already have commits that do logical things, but a bunch are 3 line changes or something. For example you might use git rebase -i to reorder all the commits touching the http endpoints together, then collapse them into "Now the HTTP endpoints do blablabla"But sometimes it's super super messy. For example you just started a new project and have just been pounding on it for a week without thought to developing in a reviewable style and now you have to make it pretty. For that you can git reset last-commit-that's-not-mine, then use a combination of git add (for adding whole files), git add -p (for adding parts of files at a time), and git commit to rebuild the branch into something logical for consumption.In either case, after all this, you fix the conflicts, and because your history is now a set of logical changes, you can stop after each commit in the git rebase workflow and build the project plus run the test suite/manually test, then bring the whole stack onto master as-is, which lets you do very clean git bisect as well if you need to find the source of a bug. And usually this also gets you smaller conflict resolution steps, and sometimes it even gets rid of conflicts you would have otherwise had. URL: https://forum.audiogames.net/post/570951/#p570951 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
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 for markers <<<, === and >>> and fix what has to be fixed around them.For more complex conflicts, there's no other choice than use diff.Pro tipp: use -w flag in diff to ignore spaces and indentation URL: https://forum.audiogames.net/post/570845/#p570845 -- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
