[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

The website is not building correctly (git pull stalled)

Dear all,

The website is not updating correctly.

https://www-master.debian.org/build-logs/webwml/git_update.log shows that
there are some local changes that are not committed thus "git pull" would exit
without doing anything.

From https://salsa.debian.org/webmaster-team/webwml
   69ba1b173fc..97729276414  master        -> origin/master
 * [new branch]              fight-entropy -> origin/fight-entropy
error: Your local changes to the following files would be overwritten by
Please commit your changes or stash them before you merge.
Updating c234875ad36..97729276414
Command exited with non-zero status 1
1.40user 0.48system 0:05.41elapsed 34%CPU (0avgtext+0avgdata
200152inputs+1040outputs (1921major+35852minor)pagefaults 0swaps

Is there any possibility that we do a "git reset --hard HEAD; git clean -xdf"
before actually "git pull"?

Boyuan Yang

Attachment: signature.asc
Description: This is a digitally signed message part

Reply to: