Re:What comes after Git?
by compsciphd on Monday December 28, 2020 @01:13PM
(#25561496)
git fetch upstream ; git rebase -i upstream/master isn't that hard.
[ Parent
| on HN ]
It depends on whether the histories have diverged and how many conflicts there are. A lot of people aren't very proficient with the use of git and will have problems (e.g., running git pull) and creating a merge commit in their branch or having conflicts they need to resolve.
The next time they open a PR using that branch, it will have commits that will clutter the branch.