WIP-merge branch always up to date rebase's master resets origin/WIP if conflict.

[MichaelDimmitt]

An optional feature.
What I am thinking:

WIP-merge branch ... (like an alternative dev branch)

a bunch of WIP-temp# branches. ex: WIP-temp1, WIP-temp2, WIP-temp3

WIP merge branch will use function rebase master every single time. If a conflict happens it will perform git reset hard origin/WIP-merge. Since the WIP-merge is never not pushed it will always be up to date.

[MichaelDimmitt]

I am intentionally not putting the git commands here because this program is for people who may not be experienced in git and they should not be messing around with rebase or reset.

I'll be managing it for them!