3 ms·
How does stg deal with periodical merges from remote/master into your current branch to keep things in sync? I find that with rebase, having master merges drama
by phist_mcgee 5y ago
How does stg deal with periodical merges from remote/master into your current branch to keep things in sync? I find that with rebase, having master merges dramatically increases the complexity of rebasing, particularly if the code you are working on has been touched by others on a different branch.
Does stacked git help with this?
- lightgreen 5y ago> Does stacked git help with this? There's no magic in resolving merge conflicts, stgit helps only to some degree. For example, stgit allows you to not fix all conflicts at once. You have a stack, and you may have first commit in a stack rebased, have a nice usable repo state, and return to rebasing of the second commit tomorrow.