Handle exit code when calling resolve-import-conflicts

[mernst]

No description provided.

[benedikt-schesch]

@mernst You don't think it's better like this in one script?

[benedikt-schesch]

@mernst I am not a fan of the structured you proposed with calling another script, it creates too much dependencies between the scripts and too much calling around in my opinion. I looked at the script and made the return values explicit because it makes it easier to understand what we are trying to do here. For me in the current way it is a lot more intuitive.
I have a problem with gitmerge_resolve.sh, the scripts only seems to remove some conflict markers but the exit statement seems to preserve the old return value so in the end it will still be marked as a merge failure, thus this script is not really doing anything since it won't be tested due to merge conflict. I am not 100% sure what the desired behavior is here.
That is why I think making the return values explicit is important.

[mernst]

I was trying to leave AST-Merging-Evaluation functionality (like printing "Conflict" and running merge commit --abort out of resolve-import-conflicts which is independently useful and exists at https://github.com/plume-lib/git-scripts. We might eventually want to use the version from there. In the meanwhile, see #218, which is a better alternative to this pull request.

[mernst]

@benedikt-schesch Why is this necessary? The script should exit with the same status as the last command in it, so this if construct seems unnecessary (throughout).

[benedikt-schesch]

#218 Is better