Always update to the specified branch even if the branch is already rebased (no commits needed to be rebased, and the branch does not need a fast forward). With the old behavior of erroring and staying on the current branch, I sometimes found myself ignoring the error message, treating it as information and assuming the branch update, and later on committing on top of origin/main instead of the main branch. feedback and ok stsp

This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@

Need for filtering by path sugggested by kn@ ok naddy@

positive feedback from Omar and kn ok kn

ok jrick

ok jrick

Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@

Problem pointed out by naddy for FreeBSD -portable. Discussed with millert, thomas adam, and naddy.

Tyring to write a test to cover this case I found that obstructed files are (correctly) detected as local modifications in the work tree. Thus they trigger the pre-condition check for local modications and 'got merge' will not even start to do any work in the presence of obstructed files.

Additional testing by Thomas Adam. ok tracey

This commit modifies the GoT main branch to be able to compile it under linux.

ok tracey

ok tracey

clean output without the use of ignore files. ok stsp