Git pull overwrites webui-user.bat on most recent commit

[Pelayo-Chacon]

I'm not sure if this was intentional. It was easy enough to reinput my modifications, just thought it may have been an oversight.

[AUTOMATIC1111]

I don't get it. The file was not edited in the repo. Why would it be overwritten? Are you doing git pull with some extra flags?

[Pelayo-Chacon]

No - that's why I thought it was strange. I've included my current launcher code for reference.

@echo off

set PYTHON=
set GIT=
set VENV_DIR=
set COMMANDLINE_ARGS=--medvram --opt-split-attention --show-negative-prompt

git pull
start http:https://127.0.0.1:7860/

call webui.bat

[i2chris]

Create your own web-user-blah.bat file that is a copy of web-user.bat. Then you'll never have merge conflicts. As far as I understood it, web-user.bat was just an example showing you how to create your own

[Pelayo-Chacon]

@i2chris That's what I'm doing now, but I figured I could save some headaches for anyone that wouldn't think to do that. Either way, any potential issues were fixed here.