4 ms·
Maybe they include things like stashing/popping current uncomitted changes, switching to target branch, pulling source and target branches first, rebasing featu
by stinos 9y ago
Maybe they include things like stashing/popping current uncomitted changes, switching to target branch, pulling source and target branches first, rebasing feature branch onto latest target branch, resolving conflicts, ... ? All of these are things I has to do at one point or another to 'just' merge some feature branch from somebody else into master while I was working on another branch myself. So if they combine all of that in one command including taking care of everything which can go wrong I can imagine getting 15 commands.
- falcolas 9y ago> So if they combine all of that in one command including taking care of everything which can go wrong I can imagine getting 15 commands. My concern would be: what happens when the automation encounters and edge case; what kind of unholy mess would you end up with? And to be fair, with GitHub and GitLab, doing local feature branch merges has become a very rare event for me in the last 5 years.
- kevingoslar 9y agoGit Town covers a ton of edge cases. Just look at their "features" folder. If something goes wrong, Git Town allows to cleanly abort and undo what it did so far and go back to where it started. That's a lot safer than the unholy mess that ensues when most people try to run "git reset --hard" or "git push --force" manually.
- Jare 9y agoEdge cases handled properly may be the killer feature of this project, at least for me. With git, as long as I'm in familiar territory it's fine, but when somethings goes off rails my head's working set explodes with options.