2) if your project uses squash merges, @GitTown is a really great tool to automatically handle all the tedious steps to keep up good git hygiene (and the docs are well-organized, informative, and concise) https://t.co/XG2wQxzZYs
#microblog https://t.co/HxLUtyvcf6 Windows users, nice little win for making the great git-town tool even more accessible. 🎉 install scoop: iwr -useb https://t.co/XRjDCUVFZM | iex scoop …
@matryer 1. git town sync (amazing go app), that triggers all my github actions or azure pipelines. I don't want it to be local, it shouldn't depend on my local machine
@way0utwest Even better... git hack ;-) Huge fan of git-town project, cross platform #go app that basically simplified my entire git workflow dramatically. It helped enforce consistency into my workflow and saves me a bunch of time. HIGHLY recommend for those interested!
Found a flow I love & close to FB stack-diffs! Uses https://t.co/yuTpCk4hAD
hack: new branch from master
append: new branch off current (prefix branches with #s)
sync: from tip, rebase & push all ancestors
new-pull-request: push & open tab to new PR
h/t @_IronHam
@the_zenspider @the_zenspider can you clarify how Git Town can respect the terminal better? BTW we still have an old version of “git town sync —all” written in Bash in the repo history if you are interested. Bash just became unwieldy at a few thousand loc hence the rewrite in Go.
@afgiel@haldunanil Developing each change in a dedicated feature branch and nesting them via Git Town to maintain the big picture view and avoid merge conflicts: https://t.co/SkEMXDCtTC
@mcclure111 Another thing you might consider if you're forced to use git is using a replacement porcelain like https://t.co/fhsJ98vcPO or https://t.co/ZBxn0uCiba that is intended to be more intuitive.